mergetools / vimdiff2on commit t5536: new test of refspec conflicts when fetching (2071e05)
   1. "$MERGE_TOOLS_DIR/vimdiff"