You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ph...@apache.org on 2014/05/02 13:32:08 UTC

svn propchange: r1591871 - svn:log

Author: philip
Revision: 1591871
Modified property: svn:log

Modified: svn:log at Fri May  2 11:32:08 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Fri May  2 11:32:08 2014
@@ -5,6 +5,8 @@ allows a --diff3-cmd script to invoke di
 
     diff3 --conflict-style modified-latest $@
 
+It also allows diff3 to be used directly as a --diff3-cmd.
+
 * tools/diff/diff3.c
   (do_diff3): Add conflict label parameters.
   (main): Add '-L' and accept up to 3 instances, add '-m' and '-E' and