mergetools / vimdiff3on commit commit: add tests of commit races (a908a31)
   1. "$MERGE_TOOLS_DIR/vimdiff"