# git mergetool documentation oversight?

1 messages from 2010-06-14 to 2010-06-14. Participants: Chris.Cheney.
Thread: https://gitlist.dev/t/24105

## Chris.Cheney, 2010-06-14 08:01

Subject: git mergetool documentation oversight?
Message-ID: <Xns9D975C4C1419DChrisCheneytesconet@80.91.229.10>
URL: https://gitlist.dev/e/Xns9D975C4C1419DChrisCheneytesconet%4080.91.229.10

```
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

```
