I'm experimenting with <<<<<<< merge conflict markers in difftastic: recreate the conflicting files and then diff them. What do you think? Merge conflicts are confusing even at the best of times, but maybe difftastic's UI can help a little.