[svnbook] r3916 committed - Fix issue 136 ("examples for external merge use the wrong argument...

[svnbook at googlecode.com]

Revision: 3916
Author:   cmpilato at gmail.com
Date:     Tue Jul 26 10:03:35 2011
Log:      Fix issue 136 ("examples for external merge use the wrong argument
order for mine and theirs arguments").

Reported by: tsteven4

* src/en/book/ch07-customizing-svn.xml
   Fix argument ordering assumptions in external merge wrapper examples.

http://code.google.com/p/svnbook/source/detail?r=3916

Modified:
  /trunk/src/en/book/ch07-customizing-svn.xml

=======================================
--- /trunk/src/en/book/ch07-customizing-svn.xml	Tue Jul 12 13:08:11 2011
+++ /trunk/src/en/book/ch07-customizing-svn.xml	Tue Jul 26 10:03:35 2011
@@ -1419,8 +1419,8 @@

  # Get the paths provided by Subversion.
  BASE   = sys.argv[1]
-MINE   = sys.argv[2]
-THEIRS = sys.argv[3]
+THEIRS = sys.argv[2]
+MINE   = sys.argv[3]
  MERGED = sys.argv[4]
  WCPATH = sys.argv[5]

@@ -1445,8 +1445,8 @@

  REM Get the paths provided by Subversion.
  SET BASE=%1
-SET MINE=%2
-SET THEIRS=%3
+SET THEIRS=%2
+SET MINE=%3
  SET MERGED=%4
  SET WCPATH=%5