mergetools / gvimdiff2on commit t6036: add a failed conflict detection case with symlink modify/modify (c6d3dd5)
   1. "$MERGE_TOOLS_DIR/vimdiff"