You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2014/05/03 01:26:57 UTC
svn commit: r1592108 - /subversion/trunk/tools/diff/diff3.c
Author: danielsh
Date: Fri May 2 23:26:57 2014
New Revision: 1592108
URL: http://svn.apache.org/r1592108
Log:
* tools/diff/diff3.c
(main): Fix labels of original and mine.
Modified:
subversion/trunk/tools/diff/diff3.c
Modified: subversion/trunk/tools/diff/diff3.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/diff/diff3.c?rev=1592108&r1=1592107&r2=1592108&view=diff
==============================================================================
--- subversion/trunk/tools/diff/diff3.c (original)
+++ subversion/trunk/tools/diff/diff3.c Fri May 2 23:26:57 2014
@@ -131,9 +131,9 @@ int main(int argc, const char *argv[])
}
case 'L':
if (!conflict_modified)
- conflict_modified = apr_pstrcat(pool, "||||||| ", arg, SVN_VA_NULL);
+ conflict_modified = apr_pstrcat(pool, "<<<<<<< ", arg, SVN_VA_NULL);
else if (!conflict_original)
- conflict_original = apr_pstrcat(pool, "<<<<<<< ", arg, SVN_VA_NULL);
+ conflict_original = apr_pstrcat(pool, "||||||| ", arg, SVN_VA_NULL);
else if (!conflict_latest)
conflict_latest = apr_pstrcat(pool, ">>>>>>> ", arg, SVN_VA_NULL);
else