cherry-pick/revert: add scissors line on merge conflict

diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index c19d8dbc9d916463d51dc0903185cb50a6cb5af7..ccde8ba491e8f119dc48accf5c10f533bf74c2fd 100755 (executable)
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -77,6 +77,14 @@ test_expect_success 'git pull -q -v' '
        test_must_be_empty out &&
        test -s err)
 '
+test_expect_success 'git pull --cleanup errors early on invalid argument' '
+       mkdir clonedcleanup &&
+       (cd clonedcleanup && git init &&
+       test_must_fail git pull --cleanup invalid "../parent" >out 2>err &&
+       test_must_be_empty out &&
+       test -s err)
+'
+
 
 test_expect_success 'git pull --force' '
        mkdir clonedoldstyle &&