From: Sebastian Schuberth Date: Tue, 6 May 2008 10:53:56 +0000 (+0200) Subject: mergetool: Make ECMerge use the settings as specified by the user in the GUI X-Git-Tag: v1.5.6-rc0~73 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4e9f786f737e55fd4ea06dbb25b14dd32b872c1;p=git.git 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 Tested-by: Steffen Prohaska Signed-off-by: Junio C Hamano --- 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 ;;