Merge branch 'js/color-on-windows-comment' into maint

diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh
index c1379b00c2efc99a700c75f5ce13b2248706cf4b..d314599428129d5759e3df5e991e5a1bb90960db 100755 (executable)
--- a/t/t3033-merge-toplevel.sh
+++ b/t/t3033-merge-toplevel.sh
@@ -19,7 +19,7 @@ test_expect_success setup '
        test_commit three &&
        git checkout right &&
        test_commit four &&
-       git checkout --orphan five &&
+       git checkout --orphan newroot &&
        test_commit five &&
        git checkout master
 '