From: Steffen Prohaska <prohaska@zib.de>
Date: Sun, 11 May 2008 07:33:09 GMT
Subject: Re: [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI
Message-ID: <183DBDB1-99BE-42C5-91DE-2488046164B7@zib.de>
In-Reply-To: <482038C4.6050402@visageimaging.com>


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