mergetools / gvimdiff3on commit Merge branch 'jk/fast-import-fixes' (b6a1261)
   1. "$MERGE_TOOLS_DIR/vimdiff"