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

Re: [PATCH 2/2] git-merge documentation: describe how conflict is presented

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 1, 2008, 10:43 UTC
Message-ID
<7vd4jow3hm.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<g9gg5l$b55$1@ger.gmane.org>
Jakub Narebski <jnareb@gmail.com> writes:
Show 7 quoted lines
> Junio C Hamano wrote:
>
>> +By default, git uses the same style as that is used by "merge" program
>> +from the RCS suite to present such a conflicted hunk, like this:
>
> Actually it is also one of diff3 output format, to be more exact it is
> format generated by "diff3 -E"/"diff3 --show-overlap"
I took this from "diff3 -m" format, fwiw.
Previous: Jakub Narebski
Message 3 of 3 in “git-merge documentation: describe how conflict is presented”
  1. 2/2 git-merge documentation: describe how conflict is presentedJunio C Hamano, Sep 1, 2008
  2. Jakub NarebskiSep 1, 2008
  3. Junio C HamanoSep 1, 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.