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, 19:08 UTC
Message-ID
<54B4FE81-30F2-4B4B-BE47-91661EF9745F@zib.de>
In-Reply-To
<7vy76g4uis.fsf@gitster.siamese.dyndns.org>
On May 11, 2008, at 7:31 PM, Junio C Hamano wrote:
Show 5 quoted lines
>> 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.
>
> Thanks, I did not have that "apply" problem.

Indeed, it is Mac OS X's Mail.app that exports mails with the wrong line endings. I did not recognize this before, so I guess something changed with OS X 10.5, which I installed recently.

	Steffen
Previous: Junio C Hamano
Message 5 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.