git mergetool documentation oversight?

From: Chris.Cheney <hidden>
Date: 2016-06-15 22:48:57

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help