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

Re: [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution - take 2

From
Alex Riesen <raa.lkml@gmail.com>
Date
Aug 4, 2006, 08:09 UTC
Message-ID
<81b0412b0608040109q683bd628rd9238662e0fdfb0@mail.gmail.com>
In-Reply-To
<11546518271379-git-send-email-martin@catalyst.net.nz>
On 8/4/06, Martin Langhoff <martin@catalyst.net.nz> wrote:
> This is a bit of a crude but really useful shortcut for conflict resolution.
> The name is bad, but git-merge-* is a different 'namespace', and git-resolve is
> also taken.
git-xxmerge?
Previous: Martin LanghoffNext: Martin Langhoff
Message 5 of 9 in “[RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution”
  1. Martin LanghoffAug 3, 2006
  2. Junio C HamanoAug 4, 2006
  3. Martin Langhoff (CatalystIT)Aug 4, 2006
  4. [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution - take 2Martin Langhoff, Aug 4, 2006
  5. Alex RiesenAug 4, 2006
  6. Martin LanghoffAug 5, 2006
  7. Martin Langhoff (CatalystIT)Aug 4, 2006
  8. Jeff KingAug 4, 2006
  9. Martin Langhoff (CatalystIT)Aug 4, 2006

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.