[svnbook] r5049 committed - branches/1.8/de/book/ch07-customizing-svn.xml
jensmf at users.sourceforge.net
jensmf at users.sourceforge.net
Wed Aug 12 03:38:01 CDT 2015
Revision: 5049
http://sourceforge.net/p/svnbook/source/5049
Author: jensmf
Date: 2015-08-12 08:38:00 +0000 (Wed, 12 Aug 2015)
Log Message:
-----------
Change DIFF3 to MERGE (r5043 in English trunk version).
Revision Links:
--------------
http://sourceforge.net/p/svnbook/source/5043
Modified Paths:
--------------
branches/1.8/de/book/ch07-customizing-svn.xml
Modified: branches/1.8/de/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.8/de/book/ch07-customizing-svn.xml 2015-08-12 08:33:17 UTC (rev 5048)
+++ branches/1.8/de/book/ch07-customizing-svn.xml 2015-08-12 08:38:00 UTC (rev 5049)
@@ -3028,7 +3028,7 @@
-->
# Aufruf des merge-Befehls (ändern Sie die folgende Zeile passend für
# Ihr merge-Programm).
-cmd = [DIFF3, '--base', BASE, '--mine', MINE, '--theirs', THEIRS,
+cmd = [MERGE, '--base', BASE, '--mine', MINE, '--theirs', THEIRS,
'--outfile', MERGED]
os.execv(cmd[0], cmd)
@@ -3049,8 +3049,8 @@
<!--
REM Configure your favorite merge program here.
-->
-REM Geben Sie hier Ihr bevorzugtes diff-Programm an.
-SET DIFF3="C:\Program Files\Funky Stuff\My Merge Tool.exe"
+REM Geben Sie hier Ihr bevorzugtes merge-Programm an.
+SET MERGE="C:\Program Files\Funky Stuff\My Merge Tool.exe"
<!--
REM Get the paths provided by Subversion.
@@ -3068,7 +3068,7 @@
-->
REM Aufruf des merge-Befehls (ändern Sie die folgende Zeile passend
REM für Ihr merge-Programm).
-%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.
More information about the svnbook-dev
mailing list