mergetools / vimdiff3on commit t6036, t6042: testcases for rename collision of already conflicting files (b28eeb3)
   1. "$MERGE_TOOLS_DIR/vimdiff"