Merge branch 'jc/format-patch-rfc-more'

[thirdparty/git.git] / t / t3434-rebase-i18n.sh

diff --git a/t/t3434-rebase-i18n.sh b/t/t3434-rebase-i18n.sh
index e6fef696bbca762554d81df6f0dbdfce3aa1b8e9..a4e482d2cd057f4deaeb25df3c0f7f47d00ff327 100755 (executable)
--- a/t/t3434-rebase-i18n.sh
+++ b/t/t3434-rebase-i18n.sh
@@ -71,7 +71,7 @@ test_rebase_continue_update_encode () {
                git config i18n.commitencoding $new &&
                test_must_fail git rebase -m main &&
                test -f .git/rebase-merge/message &&
-               git stripspace <.git/rebase-merge/message >two.t &&
+               git stripspace -s <.git/rebase-merge/message >two.t &&
                git add two.t &&
                git rebase --continue &&
                compare_msg $msgfile $old $new &&