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