[jrib]

http://psung.blogspot.com/2011/02/reducing-merge-headaches-g...

This is a good discussion on the topic including the diff3 option git has.