SourceTree and diffmerge on windows

Dominik Jeske Jun 09, 2013

I have strange behavior of SourceTree on windows. I have configured diff/merge to Diffmerge. On first computer it works but on second one Sourcetree is generating helper files (BACKUP, BASE, LOCAL, REMOTE) but diffmerge is not executed? Another thing is that on first machine after resolving all conflicts Sourcetree keep some of these helper files on disk (I have to delete it manually)

3 answers

1 accepted

1 vote

Steve Streeting Jun 10, 2013

This is the standard git behaviour - I usually add *.orig to my global ignore list and just tidy these files up periodically.

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

0 vote

Dominik Jeske Jun 10, 2013

I have reinstalled windows and now I have only one problem :) After successful merge of some file - for instance file.ext there is another file in solution file.ext.orig and current branch is in ‘Uncommitted changes’ – I have to delete this file manually to complete merge.