mergetools / vimdiff3on commit Merge branch 'mh/fast-import-get-mark' (c0d5034)
   1. "$MERGE_TOOLS_DIR/vimdiff"