mergetools / gvimdiffon commit Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign (f14a310)
   1. "$MERGE_TOOLS_DIR/vimdiff"