From: Michael J Gruber Date: Tue, 14 Dec 2010 09:18:34 GMT Subject: [PATCH 1/2] git-difftool.txt: correct the description of $BASE and describe $MERGED Message-ID: <0833a4451b70db4c4e0be5753be53e262a9c5628.1292317348.git.git@drmicha.warpmail.net> In-Reply-To: <4D073619.2010103@drmicha.warpmail.net> Signed-off-by: Michael J Gruber --- 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 6fffbc7..756d95d 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -56,8 +56,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 :: --extcmd=:: -- 1.7.3.3.739.g52f77.dirty