运行svn update后，若版本冲突，将有如下选项可供选择：
(e) edit - change merged file in an editor
(df) diff-full - show all changes made to merged file
(r) resolved - accept merged version of file
(dc) display-conflict - show all conflicts (ignoring merged version) 产生综合版本，就是带两条杠的那种，需要大量的后期处理，不推荐
(mc) mine-conflict - accept my version for all conflicts (same) 使用自己的版本
(tc) theirs-conflict - accept their version for all conflicts (same) 使用别人的版本
(mf) mine-full - accept my version of entire file (even non-conflicts)
(tf) theirs-full - accept their version of entire file (same)
(p) postpone - mark the conflict to be resolved later
(l) launch - launch external tool to resolve conflict
(s) show all - show this list