http://psung.blogspot.com/2011/02/reducing-merge-headaches-git-meets.html?m=1 http://psung.blogspot.com/2011/02/reducing-merge-headaches-g... This is a good di

http://psung.blogspot.com/2011/02/reducing-merge-headaches-git-meets.html?m=1 http://psung.blogspot.com/2011/02/reducing-merge-headaches-g... This is a good discussion on the topic including the diff3 option git has.