diff options
| author | Eric Dill <thedizzle@gmail.com> | 2020-09-09 10:07:40 -0400 |
|---|---|---|
| committer | Sebastian Thiel <sebastian.thiel@icloud.com> | 2020-09-09 23:10:40 +0800 |
| commit | 135e7750f6b70702de6ce55633f2e508188a5c05 (patch) | |
| tree | 590a4189f5006edecf7ecef983fde26e423b5b68 | |
| parent | 1759a78b31760aa4b23133d96a8cde0d1e7b7ba6 (diff) | |
| download | gitpython-135e7750f6b70702de6ce55633f2e508188a5c05.tar.gz | |
Fix typo
| -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)) |