mergetools / vimdiff3on commit Merge branch 'ab/sha1dc-build' into next (ba9ff2b)
   1. "$MERGE_TOOLS_DIR/vimdiff"