Merge branch 'mh/show-branch-color' into sb/show-branch-parse-options

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index be7ae5a0041a0d06b40a7152d4c5d495a842a87f..6e391a370208c9a0a6e73facc87f6a0e5081b929 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -83,9 +83,9 @@ test_expect_success 'rebase a single mode change' '
      git checkout -b modechange HEAD^ &&
      echo 1 > X &&
      git add X &&
-     chmod a+x A &&
+     test_chmod +x A &&
      test_tick &&
-     git commit -m modechange A X &&
+     git commit -m modechange &&
      GIT_TRACE=1 git rebase master
 '