mergetools / vimdiff2on commit t9000-addresses: update expected results after fix (8a420ed)
   1. "$MERGE_TOOLS_DIR/vimdiff"