From: Sebastian Schuberth <sschuberth@visageimaging•com>
To: git@vger•kernel.org
Subject: [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI
Date: Tue, 06 May 2008 12:53:56 +0200 [thread overview]
Message-ID: <482038C4.6050402@visageimaging.com> (raw)
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>
---
git-mergetool.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 5c86f69..fcdec4a 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
;;
--
1.5.5.GIT
next reply other threads:[~2008-05-06 11:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-06 10:53 Sebastian Schuberth [this message]
2008-05-06 12:06 ` [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI Sebastian Schuberth
2008-05-11 7:33 ` Steffen Prohaska
2008-05-11 17:31 ` Junio C Hamano
2008-05-11 19:08 ` Steffen Prohaska
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=482038C4.6050402@visageimaging.com \
--to=sschuberth@visageimaging$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox