Skip to content

Commit 135e775

Browse files
ericdillByron
authored andcommitted
Fix typo
1 parent 1759a78 commit 135e775

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎test/test_docs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def update(self, op_code, cur_count, max_count=None, message=''):
155155

156156
# prepare a merge
157157
master = cloned_repo.heads.master # right-hand side is ahead of us, in the future
158-
merge_base = cloned_repo.merge_base(new_branch, master) # allwos for a three-way merge
158+
merge_base = cloned_repo.merge_base(new_branch, master) # allows for a three-way merge
159159
cloned_repo.index.merge_tree(master, base=merge_base) # write the merge result into index
160160
cloned_repo.index.commit("Merged past and now into future ;)",
161161
parent_commits=(new_branch.commit, master.commit))

0 commit comments

Comments
 (0)