git-difftool.txt: correct the description of $BASE and describe $MERGED
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Dec 14, 2010 at 10:18 UTC
51baceeec4884c14ac8c77902ec6973ab36421ca
1 file changed
+3
-2
Documentation/git-difftool.txt
+3
-2
@@ -55,8 +55,9 @@ the configured command line will be invoked with the following
55
variables available: `$LOCAL` is set to the name of the temporary
56
file containing the contents of the diff pre-image and `$REMOTE`
57
is set to the name of the temporary file containing the contents
58
-of the diff post-image. `$BASE` is provided for compatibility
59
-with custom merge tool commands and has the same value as `$LOCAL`.
58
+of the diff post-image. `$MERGED` is the name of the file which is
59
+being compared. `$BASE` is provided for compatibility
60
+with custom merge tool commands and has the same value as `$MERGED`.
61
62
-x <command>::
63
--extcmd=<command>::