mergetools / gvimdiff2on commit t3903: add test for --intent-to-add file (b6e531e)
   1. "$MERGE_TOOLS_DIR/vimdiff"