[svnbook] r4860 committed - Translation: External diff3
svnbook at googlecode.com
svnbook at googlecode.com
Tue Jul 22 00:11:55 CDT 2014
Revision: 4860
Author: jmfelderhoff at gmx.eu
Date: Tue Jul 22 05:11:39 2014 UTC
Log: Translation: External diff3
http://code.google.com/p/svnbook/source/detail?r=4860
Modified:
/branches/1.7/de/book/ch07-customizing-svn.xml
=======================================
--- /branches/1.7/de/book/ch07-customizing-svn.xml Tue Jul 22 05:09:02 2014
UTC
+++ /branches/1.7/de/book/ch07-customizing-svn.xml Tue Jul 22 05:11:39 2014
UTC
@@ -2745,7 +2745,7 @@
REM Aufruf des Dreiwege-Vergleichs-Befehls (ändern Sie die folgende
REM Zeile, damit es für Ihr Dreiwege-Vergleichsprogramm einen Sinn
REM ergibt).
-%DIFF3% - -older %OLDER% - -mine %MINE% - -yours %YOURS%
+%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS%
<!--
REM After performing the merge, this script needs to print the contents
More information about the svnbook-dev
mailing list