mergetools / vimdiff3on commit Tighten and correct a few testcases for merging and cherry-picking (7c5585f)
   1. "$MERGE_TOOLS_DIR/vimdiff"