mergetools / gvimdiff2on commit Merge branch 'jk/fast-import-history-bugfix' (991fd97)
   1. "$MERGE_TOOLS_DIR/vimdiff"