From 135e7750f6b70702de6ce55633f2e508188a5c05 Mon Sep 17 00:00:00 2001 From: Eric Dill Date: Wed, 9 Sep 2020 10:07:40 -0400 Subject: Fix typo --- test/test_docs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_docs.py b/test/test_docs.py index 15c8f8d7..220156bc 100644 --- a/test/test_docs.py +++ b/test/test_docs.py @@ -155,7 +155,7 @@ class Tutorials(TestBase): # prepare a merge master = cloned_repo.heads.master # right-hand side is ahead of us, in the future - merge_base = cloned_repo.merge_base(new_branch, master) # allwos for a three-way merge + merge_base = cloned_repo.merge_base(new_branch, master) # allows for a three-way merge cloned_repo.index.merge_tree(master, base=merge_base) # write the merge result into index cloned_repo.index.commit("Merged past and now into future ;)", parent_commits=(new_branch.commit, master.commit)) -- cgit v1.2.1