mergetools / vimdiff3on commit Merge branch 'jc/maint-index-pack-keep' (d4a2230)
   1. "$MERGE_TOOLS_DIR/vimdiff"