命令 svn upConflict discovered in 'test.txt'.Select: (p) postpone, (df) diff-full, (e) edit, ...