Merge branch 'nd/i18n'

diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh
index 846f85c27e97642972dff7168ab2aeed49988fad..5f892e33d7e53e8871df256b3344ebd0476712ee 100755 (executable)
--- a/t/t3425-rebase-topology-merges.sh
+++ b/t/t3425-rebase-topology-merges.sh
@@ -109,6 +109,11 @@ test_run_rebase success 'd e n o' ''
 test_run_rebase success 'd e n o' -m
 test_run_rebase success 'd n o e' -i
 
+if ! test_have_prereq REBASE_P; then
+       skip_all='skipping git rebase -p tests, as asked for'
+       test_done
+fi
+
 test_expect_success "rebase -p is no-op in non-linear history" "
        reset_rebase &&
        git rebase -p d w &&