mergetools / vimdiff3on commit lockfile: avoid transitory invalid states (707103f)
   1. "$MERGE_TOOLS_DIR/vimdiff"