From 51baceeec4884c14ac8c77902ec6973ab36421ca Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 14 Dec 2010 10:18:34 +0100 Subject: git-difftool.txt: correct the description of $BASE and describe $MERGED Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/git-difftool.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Documentation') 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 :: --extcmd=:: -- cgit v1.2.3