index 63e49f310cdc0bf99cb1578c29f2a3da4059da75..ea140236162894ed2e5691b57ba8c5cf98e5627d 100755 (executable)
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
test_expect_success 'merge-msg test #3' '
test_expect_success 'merge-msg test #3' '
- git repo-config merge.summary true &&
+ git config merge.summary true &&
git checkout master &&
setdate &&
git checkout master &&
setdate &&
test_expect_success 'merge-msg test #4' '
test_expect_success 'merge-msg test #4' '
- git repo-config merge.summary true &&
+ git config merge.summary true &&
git checkout master &&
setdate &&
git checkout master &&
setdate &&
test_expect_success 'merge-msg test #5' '
test_expect_success 'merge-msg test #5' '
- git repo-config merge.summary yes &&
+ git config merge.summary yes &&
git checkout master &&
setdate &&
git checkout master &&
setdate &&