X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6200-fmt-merge-msg.sh;h=ea140236162894ed2e5691b57ba8c5cf98e5627d;hb=207dfa07919baba034291f1d5169f86272839d59;hp=63e49f310cdc0bf99cb1578c29f2a3da4059da75;hpb=0f2ca9d5c99436d048bfe0a7161b4365a731938f;p=git.git diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 63e49f310..ea1402361 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -108,7 +108,7 @@ EOF test_expect_success 'merge-msg test #3' ' - git repo-config merge.summary true && + git config merge.summary true && git checkout master && setdate && @@ -138,7 +138,7 @@ EOF test_expect_success 'merge-msg test #4' ' - git repo-config merge.summary true && + git config merge.summary true && git checkout master && setdate && @@ -150,7 +150,7 @@ test_expect_success 'merge-msg test #4' ' test_expect_success 'merge-msg test #5' ' - git repo-config merge.summary yes && + git config merge.summary yes && git checkout master && setdate &&