mergetools / gvimdiffon commit Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files (2e2f028)
   1. "$MERGE_TOOLS_DIR/vimdiff"