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

Re: Visualizing merge conflicts after the fact (using kdiff3)

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 19, 2015, 16:19 UTC
Message-ID
<xmqqwpyzacx3.fsf@gitster.dls.corp.google.com>
In-Reply-To
<5583D40F.7030300@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> writes:
Show 7 quoted lines
> Junio C Hamano venit, vidit, dixit 18.06.2015 17:57:
>> 
>> Perhaps 'tr/remerge-diff' (on 'pu') is of interest?
>
> I haven't reviewed remerge-diff but merged it on top of my own local
> additions and ran the full test suite successfully. Any big blocker to
> watch out for?

"What's cooking" report marks it as "Waiting for a reroll. ($gmane/256591)."

So 
  http://thread.gmane.org/gmane.comp.version-control.git/256591
would be the first place to revisit.
Previous: Michael J GruberNext: Sebastian Schuberth
Message 8 of 9 in “Visualizing merge conflicts after the fact (using kdiff3)”
  1. Eric RaibleJun 16, 2015
  2. Johannes SchindelinJun 16, 2015
  3. Eric RaibleJun 16, 2015
  4. Michael J GruberJun 18, 2015
  5. Johannes SchindelinJun 18, 2015
  6. Junio C HamanoJun 18, 2015
  7. Michael J GruberJun 19, 2015
  8. Junio C HamanoJun 19, 2015
  9. Sebastian SchuberthJul 6, 2015

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.