mergetools / vimdiff2on commit Merge branch 'mh/packed-refs-various' (2f1ef15)
   1. "$MERGE_TOOLS_DIR/vimdiff"