disable-broken-test.patch
fix-test_merge.py.patch
