aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@visageimaging.com>2008-05-06 12:53:56 +0200
committerJunio C Hamano <gitster@pobox.com>2008-05-11 10:12:19 -0700
commitf4e9f786f737e55fd4ea06dbb25b14dd32b872c1 (patch)
tree191a1144fbe307286b5aae9aaf377f705f5f0dbf
parent37c22a4bf801403f71a5e9674d8e314ce575945e (diff)
downloadgit-f4e9f786f737e55fd4ea06dbb25b14dd32b872c1.tar.gz
git-f4e9f786f737e55fd4ea06dbb25b14dd32b872c1.tar.xz
mergetool: Make ECMerge use the settings as specified by the user in the GUI
When run from the command line, ECMerge does not automatically use the same settings for a merge / diff that it would use when starting the GUI and loading files manually. In the first case the built-in factory defaults would be used, while in the second case the settings the user has specified in the GUI would be used, which can be misleading. Specifying the "--default" command line option changes this behavior so that always the user specfified GUI settings are used. Signed-off-by: Sebastian Schuberth <sschuberth@visageimaging.com> Tested-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-mergetool.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 5c86f6922..fcdec4a50 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -237,9 +237,9 @@ merge_file () {
ecmerge)
touch "$BACKUP"
if base_present; then
- "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --mode=merge3 --to="$MERGED"
+ "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"
else
- "$merge_tool_path" "$LOCAL" "$REMOTE" --mode=merge2 --to="$MERGED"
+ "$merge_tool_path" "$LOCAL" "$REMOTE" --default --mode=merge2 --to="$MERGED"
fi
check_unchanged
;;