mergetools / vimdiff3on commit Merge branch 'jk/pack-shallow-always-without-bitmap' (a3d54f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"