mergetools / vimdiff2on commit receive-pack: turn on index-pack resolving progress (d06303b)
   1. "$MERGE_TOOLS_DIR/vimdiff"