* tools/diff/diff3.c
  (main): Fix labels of original and mine.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1592108 13f79535-47bb-0310-9956-ffa450edef68
diff3: Add a '--help' option.

* tools/diff/diff3.c
  (main): As above.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1592110 13f79535-47bb-0310-9956-ffa450edef68