Code

git-gui: Support resolving conflicts via the diff context menu.