{"thread":{"id":"24105","subject":"git mergetool documentation oversight?","startedAt":"2010-06-14T08:01:35Z","lastAt":"2010-06-14T08:01:35Z","messageCount":1,"participants":["Chris.Cheney"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"143645","messageId":"Xns9D975C4C1419DChrisCheneytesconet@80.91.229.10","threadId":"24105","inReplyTo":null,"subject":"git mergetool documentation oversight?","fromName":"Chris.Cheney","fromEmail":"chris.cheney.nospam@tesco.net","sentAt":"2010-06-14T08:01:35Z","receivedAt":"2010-06-14T08:01:35Z","isPatch":false,"sender":{"key":"chris.cheney.nospam@tesco.net","avatar":null},"body":"Having just tripped over this, it would be helpful if the fact that git \nmergetool saves the merge-conflict version of the file with a .orig suffix \nand that the file should be deleted before adding and committing the merge \n(as described at \nhttp://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/) \nwere documented on the git-mergetool page.\n\nChris\n"}]}