| commit | f4e9f786f737e55fd4ea06dbb25b14dd32b872c1 | |
| author | Sebastian Schuberth <sschuberth@visageimaging.com> | |
| Tue, 6 May 2008 10:53:56 +0000 (6 12:53 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 11 May 2008 17:12:19 +0000 (11 10:12 -0700) | ||
| tree | 191a1144fbe307286b5aae9aaf377f705f5f0dbf | treesnapshot (tar.gz zip) |
| parent | 37c22a4bf801403f71a5e9674d8e314ce575945e | commitdiff |
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>
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>
| git-mergetool.sh | diffblobblamehistory |