mergetools / vimdiff3on commit perf: work around the tested repo having an index.lock (154ffee)
   1. "$MERGE_TOOLS_DIR/vimdiff"