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

Re: Merge format documented?

From
Jakub Narebski <jnareb@gmail.com>
Date
Mar 27, 2009, 16:05 UTC
Message-ID
<m3y6ur0x4m.fsf@localhost.localdomain>
In-Reply-To
<200903230419.50000.agruen@suse.de>
Andreas Gruenbacher <agruen@suse.de> writes:
Show 6 quoted lines
> Hello,
> 
> is the format that git normally uses for indicating merge conflicts in files 
> (the <<< === >>> markers) documented somewhere?  How exactly does it differ 
> from the diff3 format (<<< ||| === >>>)?  Diff3's -m mode seems to come close 
> to what git does, except that git doesn't produce the ||| section:

It is rcmerge / merge from RCS / CVS output format (and I think it is also format used for other VCS), and IIRC it is equivalent to "diff3 -E" format

> Does git ever output a ||| section?

You can ask for it with merge.conflictstyle configuration variable, or --conflict=<style> option to git-checkout.

-- 
Jakub Narebski
Poland
ShadeHawk on #git
Previous: Johannes Sixt
Message 6 of 6 in “Merge format documented?”
  1. Andreas GruenbacherMar 23, 2009
  2. Junio C HamanoMar 23, 2009
  3. Andreas GruenbacherMar 23, 2009
  4. Junio C HamanoMar 23, 2009
  5. Johannes SixtMar 23, 2009
  6. Jakub NarebskiMar 27, 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.