Skip to content

Commit

Permalink
git-difftool.txt: correct the description of $BASE and describe $MERGED
Browse files Browse the repository at this point in the history 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael J Gruber authored and Junio C Hamano committed Dec 16, 2010
1 parent fa1c854 commit 51bacee
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Documentation/git-difftool.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ the configured command line will be invoked with the following
variables available: `$LOCAL` is set to the name of the temporary
file containing the contents of the diff pre-image and `$REMOTE`
is set to the name of the temporary file containing the contents
of the diff post-image. `$BASE` is provided for compatibility
with custom merge tool commands and has the same value as `$LOCAL`.
of the diff post-image. `$MERGED` is the name of the file which is
being compared. `$BASE` is provided for compatibility
with custom merge tool commands and has the same value as `$MERGED`.

-x <command>::
--extcmd=<command>::
Expand Down

0 comments on commit 51bacee

Please sign in to comment.