阡陌博客 - svn 解决冲突 的评论
type: channel
link: https://www.kinmor.com/archives/372/
description: 命令 svn upConflict discovered in 'test.txt'.Select: (p) postpone, (df) diff-full, (e) edit, ...