Merge branch 'jk/rebase-interative-eval-fix' into maint

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 4e713f7aa54d4713cfd74978460ec9aa144fc773..ff7a9e968f4dde078a131ee65306ae6784e8faa5 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -20,7 +20,7 @@ difftool_test_setup ()
 prompt_given ()
 {
        prompt="$1"
-       test "$prompt" = "Launch 'test-tool' [Y/n]: branch"
+       test "$prompt" = "Launch 'test-tool' [Y/n]? branch"
 }
 
 # Create a file on master and change it on branch