git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Steffen Prohaska <prohaska@zib.de>
Date
May 11, 2008, 07:33 UTC
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:
Show 13 quoted lines
> 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
Previous: Sebastian SchuberthNext: Junio C Hamano
Message 3 of 5 in “mergetool: Make ECMerge use the settings as specified by the user in the GUI”
  1. mergetool: Make ECMerge use the settings as specified by the user in the GUISebastian Schuberth, May 6, 2008
  2. Sebastian SchuberthMay 6, 2008
  3. Steffen ProhaskaMay 11, 2008
  4. Junio C HamanoMay 11, 2008
  5. Steffen ProhaskaMay 11, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.