tree 191a1144fbe307286b5aae9aaf377f705f5f0dbf
parent 37c22a4bf801403f71a5e9674d8e314ce575945e
author Sebastian Schuberth <sschuberth@visageimaging.com> 1210071236 +0200
committer Junio C Hamano <gitster@pobox.com> 1210525939 -0700

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>