mergetools / vimdiff3on commit Merge branch 'jk/fast-import-die-nicely-fix' (1585dfe)
   1. "$MERGE_TOOLS_DIR/vimdiff"