threads / discuss / 24105

git mergetool documentation oversight?

Subject: git mergetool documentation oversight?

## tl;dr

One message between Jun 14, 2010 and Jun 14, 2010.

replies: 0people: 1as markdown or json

Chris.Cheney· Jun 14, 2010, 08:01 UTC · lore

Having just tripped over this, it would be helpful if the fact that git mergetool saves the merge-conflict version of the file with a .orig suffix and that the file should be deleted before adding and committing the merge (as described at http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/) were documented on the git-mergetool page.

Chris

$ 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.