mergetools / vimdiff2on commit test-lib: rearrange start/end of test_expect_* and test_skip (ae75342)
   1. "$MERGE_TOOLS_DIR/vimdiff"