X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/519a11f91b58d475d849572959fbfe98dcd8ab95..09340f5f9daadc37204f8e13e668af7c02fc1814:/t/t1301-assimilate.sh diff --git a/t/t1301-assimilate.sh b/t/t1301-assimilate.sh index 26b263c..906f5bb 100755 --- a/t/t1301-assimilate.sh +++ b/t/t1301-assimilate.sh @@ -65,7 +65,7 @@ test_expect_success \ ' test_expect_success \ - 'Create a mege commit' \ + 'Create a merge commit' \ ' git checkout -b br master^^ && echo woof > woof.txt &&