diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2010-12-14 10:18:34 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-12-16 13:01:31 -0800 |
| commit | 51baceeec4884c14ac8c77902ec6973ab36421ca (patch) | |
| tree | a32eb8c6c3b7528a1e6bc69a790c4151839fd254 /Documentation | |
| parent | Git 1.7.3.4 (diff) | |
| download | tgif-51baceeec4884c14ac8c77902ec6973ab36421ca.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-difftool.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 8250bad2ce..498b1610f4 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -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>:: |