mergetools / gvimdiff3on commit t6036: add lots of detail for directory/file conflicts in recursive case (327ac9c)
   1. "$MERGE_TOOLS_DIR/vimdiff"