checkout --conflict=diff3: add a label for ancestor

diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh
index 83d4ba679850c2ae2548bcfcce3f22227fcde8c7..b463b4f05ce43ee345a0594528d684befe7c2ef3 100755 (executable)
--- a/t/t4120-apply-popt.sh
+++ b/t/t4120-apply-popt.sh
@@ -22,4 +22,9 @@ test_expect_success 'apply git diff with -p2' '
        git apply -p2 patch.file
 '
 
+test_expect_success 'apply with too large -p' '
+       test_must_fail git apply --stat -p3 patch.file 2>err &&
+       grep "removing 3 leading" err
+'
+
 test_done