Thread (3 messages) flat view 3 messages, 2 authors, 2016-06-15

Re: [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI

From: Steffen Prohaska <hidden>
Date: 2016-06-15 22:44:35

On May 6, 2008, at 12:53 PM, Sebastian Schuberth wrote:
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.

I tested the change and propose to take the patch.  I needed,
however, to remove dos line endings from the patch before it
applied cleanly.

	Steffen
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help