[PATCH 2/4] Changed the documented variable for mergetool's target file
From: Charles Bailey <hidden>
Date: 2016-06-15 22:44:14
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Previously it was $path, now it is $MERGED which is more consistent with the other documented variables for merge tools and a little more meaningful. Signed-off-by: Charles Bailey <redacted> --- Documentation/config.txt | 2 +- git-mergetool.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 12d87d4..53f790d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -727,7 +727,7 @@ mergetool.<tool>.cmd:: 'LOCAL' is the name of a temporary file containing the contents of the file on the current branch; 'REMOTE' is the name of a temporary file containing the contents of the file from the branch being - merged; 'path' contains the name of the file to which the merge + merged; 'MERGED' contains the name of the file to which the merge tool should write the results of a successful merge. mergetool.<tool>.trustExitCode::
diff --git a/git-mergetool.sh b/git-mergetool.sh
index cf30e21..4681e9a 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh@@ -275,10 +275,10 @@ merge_file () { if test -n "$merge_tool_cmd"; then if test "$merge_tool_trust_exit_code" = "false"; then touch "$BACKUP" - ( eval $merge_tool_cmd ) + ( MERGED="$path" eval $merge_tool_cmd ) check_unchanged else - ( eval $merge_tool_cmd ) + ( MERGED="$path" eval $merge_tool_cmd ) status=$? fi save_backup
--
1.5.4.1.34.g94bf