Skip to content

Commit 51bacee

Browse files
Michael J Grubergitster
authored andcommitted
git-difftool.txt: correct the description of $BASE and describe $MERGED
Signed-off-by: Michael J Gruber <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fa1c854 commit 51bacee

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Documentation/git-difftool.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ the configured command line will be invoked with the following
5555
variables available: `$LOCAL` is set to the name of the temporary
5656
file containing the contents of the diff pre-image and `$REMOTE`
5757
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`.
6061

6162
-x <command>::
6263
--extcmd=<command>::

0 commit comments

Comments
 (0)