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

Re: how do I resolve this merge manually + mergetool bug

From
Charles Bailey <charles@hashpling.org>
Date
Feb 24, 2009, 07:47 UTC
Message-ID
<20090224074727.GA23927@hashpling.org>
In-Reply-To
<81bfc67a0902232204y7a1e9a91x6cbf751319664734@mail.gmail.com>
On Tue, Feb 24, 2009 at 01:04:23AM -0500, Caleb Cushing wrote:
> regardless of mergetools problems I'd like to know how to fix this
> merge without mergetool.

I see you've now resolved this without mergetool, I'll look at adding a test case to mergetool and see how easy it is to get it to handle this case better.

-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
Previous: Caleb CushingNext: Caleb Cushing
Message 6 of 8 in “how do I resolve this merge manually + mergetool bug”
  1. Caleb CushingFeb 24, 2009
  2. Junio C HamanoFeb 24, 2009
  3. Caleb CushingFeb 24, 2009
  4. Junio C HamanoFeb 24, 2009
  5. Caleb CushingFeb 24, 2009
  6. Charles BaileyFeb 24, 2009
  7. Caleb CushingFeb 24, 2009
  8. Charles BaileyFeb 24, 2009

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.