diff options
Diffstat (limited to 'test/test_docs.py')
| -rw-r--r-- | test/test_docs.py | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |