Revision 1491816

Add options to the interactive file merge which concatenate conflicted
'their' and 'mine' versions.

This is useful when resolving text conflicts in append-only files.

One example is our release signature files, where new PGP signatures are
appended, but never removed or edited. If someone else was quicker with
committing their signature, pick 'm' at the conflict prompt, then pick '12'
during the file merge, then pick 'r' to mark the conflict resolved.

* subversion/svn/file-merge.c
  (merge_chunks): Add new options "12" and "21" which can be used to
    concatenate conflicted chunks in either order.