Comment 9 for bug 562669

FWIW, I much prefer the --show-base output because it's easy to go from the --show-base output to the --reprocess output (e.g. you can do that with Emacs's smerge-mode), whereas the reverse is simply impossible (that is, without doing the equivalent of re-merging).