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

Merge format documented?

From
AGAndreas Gruenbacher <agruen@suse.de>
Date
Mar 23, 2009, 03:19 UTC
Message-ID
<200903230419.50000.agruen@suse.de>
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:

	$ seq 1 7 > a
	$ seq 1 7 | sed -e 's/4/4b/' > b
	$ seq 1 7 | sed -e 's/3/3c/' > c
	$ diff3 -m c a b
	> 1
	> 2
	> <<<<<<< c
	> 3c
	> 4
	> ||||||| a
	> 3
	> 4
	> =======
	> 3
	> 4b
	> >>>>>>> b
	> 5
	> 6
	> 7
Git's output in this case is:
	> 1
	> 2
	> <<<<<<< this-branch
	> 3c
	> 4
	> =======
	> 3
	> 4b
	> >>>>>>> merged-branch
	> 5
	> 6
	> 7
Does git ever output a ||| section?

Thanks, Andreas

Next: Junio C Hamano
Message 1 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.