mergetools / gvimdiff3on commit t1404: add a bunch of tests of D/F conflicts (2e9de01)
   1. "$MERGE_TOOLS_DIR/vimdiff"