Code

git-gui: Show special diffs for complex conflict cases.