mergetools / gvimdiff2on commit t4150: fix broken test for am --scissors (b7446fc)
   1. "$MERGE_TOOLS_DIR/vimdiff"