mergetools / gvimdiffon commit Merge branch 'js/misc-git-gui-stuff' of ../git-gui (02a5f25)
   1. "$MERGE_TOOLS_DIR/vimdiff"