mergetools / gvimdiffon commit t: use test_must_fail instead of hand-rolled blocks (0a5e3c5)
   1. "$MERGE_TOOLS_DIR/vimdiff"