diff -p: squelch "diff --git" header for stat-dirty paths

[git.git] / t / t4300-merge-tree.sh

diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index 1eba8623695561372aab192a8608130f1a0fda18..46c3fe76d3867be394c6b9089a4aa9a1f3f6bba0 100755 (executable)
--- a/t/t4300-merge-tree.sh
+++ b/t/t4300-merge-tree.sh
@@ -24,7 +24,7 @@ EXPECTED
        test_cmp expected actual
 '
 
-test_expect_failure 'file add !A, B' '
+test_expect_success 'file add !A, B' '
        cat >expected <<\EXPECTED &&
 added in local
   our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
@@ -195,7 +195,7 @@ EXPECTED
        test_cmp expected actual
 '
 
-test_expect_failure 'file remove !A, B' '
+test_expect_success 'file remove !A, B' '
        cat >expected <<\EXPECTED &&
 removed in remote
   base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
@@ -213,7 +213,7 @@ EXPECTED
        test_cmp expected actual
 '
 
-test_expect_failure 'file change A, remove B' '
+test_expect_success 'file change A, remove B' '
        cat >expected <<\EXPECTED &&
 removed in remote
   base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE