Merge branch 'cb/git-gui-ttk-style'

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 503a88d0296a2620ed0ba6e70f784fcd58dc4a9b..6c0b7ea4addc8f1569b1b85f58dd3072fb863f33 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -528,7 +528,7 @@ test_expect_success 'git branch -c -f o/q o/p should work when o/p exists' '
        git branch -c -f o/q o/p
 '
 
-test_expect_success 'git branch -c qq rr/qq should fail when r exists' '
+test_expect_success 'git branch -c qq rr/qq should fail when rr exists' '
        git branch qq &&
        git branch rr &&
        test_must_fail git branch -c qq rr/qq