We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent fa1c854 commit 51baceeCopy full SHA for 51bacee
Documentation/git-difftool.txt
@@ -55,8 +55,9 @@ the configured command line will be invoked with the following
55
variables available: `$LOCAL` is set to the name of the temporary
56
file containing the contents of the diff pre-image and `$REMOTE`
57
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`.
+of the diff post-image. `$MERGED` is the name of the file which is
+being compared. `$BASE` is provided for compatibility
60
+with custom merge tool commands and has the same value as `$MERGED`.
61
62
-x <command>::
63
--extcmd=<command>::
0 commit comments