svn commit: [svnbook source]:[5045] branches/1.6/en

[cmpilato at users.sourceforge.net]

Revision: 5045
          http://sourceforge.net/p/svnbook/source/5045
Author:   cmpilato
Date:     2015-08-06 20:22:42 +0000 (Thu, 06 Aug 2015)
Log Message:
-----------
Merge from /trunk/en r5043:

   [tickets:#231] Consistently use MERGE when describing custom merge tools
   
   * en/book/ch07-customizing-svn.xml
     (svn.advanced.externaldifftools.merge): Fix example merge tool
       wrapper scripts to refer to the variable MERGE (rather than
       DIFF3).
   
   Patch by: James McCoy <jamessan{__AT__}users.sf.net>

Revision Links:
--------------
    http://sourceforge.net/p/svnbook/source/5043

Modified Paths:
--------------
    branches/1.6/en/book/ch07-customizing-svn.xml

Property Changed:
----------------
    branches/1.6/en/

Index: branches/1.6/en
===================================================================
--- branches/1.6/en	2015-08-06 20:21:10 UTC (rev 5044)
+++ branches/1.6/en	2015-08-06 20:22:42 UTC (rev 5045)

Property changes on: branches/1.6/en
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:3996,3999,4011,4024,4036-4037,4039,4043,4046,4049,4052,4054,4060,4062,4066,4070-4073,4076,4078-4079,4081-4089,4092,4095,4097,4099,4103,4105,4107,4117-4118,4121,4136-4137,4192-4193,4231,4261,4296,4299,4305,4352,4364,4742,4958
+/trunk/en:3996,3999,4011,4024,4036-4037,4039,4043,4046,4049,4052,4054,4060,4062,4066,4070-4073,4076,4078-4079,4081-4089,4092,4095,4097,4099,4103,4105,4107,4117-4118,4121,4136-4137,4192-4193,4231,4261,4296,4299,4305,4352,4364,4742,4958,5043
\ No newline at end of property
Modified: branches/1.6/en/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.6/en/book/ch07-customizing-svn.xml	2015-08-06 20:21:10 UTC (rev 5044)
+++ branches/1.6/en/book/ch07-customizing-svn.xml	2015-08-06 20:22:42 UTC (rev 5045)
@@ -1477,7 +1477,7 @@
 
 # Call the merge command (change the following line to make sense for
 # your merge program).
-cmd = [DIFF3, '--base', BASE, '--mine', MINE, '--theirs', THEIRS,
+cmd = [MERGE, '--base', BASE, '--mine', MINE, '--theirs', THEIRS,
               '--outfile', MERGED]
 os.execv(cmd[0], cmd)
 
@@ -1492,7 +1492,7 @@
 @ECHO OFF
 
 REM Configure your favorite merge program here.
-SET DIFF3="C:\Program Files\Funky Stuff\My Merge Tool.exe"
+SET MERGE="C:\Program Files\Funky Stuff\My Merge Tool.exe"
 
 REM Get the paths provided by Subversion.
 SET BASE=%1
@@ -1503,7 +1503,7 @@
 
 REM Call the merge command (change the following line to make sense for
 REM your merge program).
-%DIFF3% --base %BASE% --mine %MINE% --theirs %THEIRS% --outfile %MERGED%
+%MERGE% --base %BASE% --mine %MINE% --theirs %THEIRS% --outfile %MERGED%
 
 REM Return an errorcode of 0 if the conflict was resolved; 1 otherwise.
 REM Any other errorcode will be treated as fatal.