Commit 135e775
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -155,7 +155,7 @@ def update(self, op_code, cur_count, max_count=None, message=''): | |||
| 155 | 155 | ||
| 156 | 156 | # prepare a merge | |
| 157 | 157 | 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 | ||
| 159 | 159 | cloned_repo.index.merge_tree(master, base=merge_base) # write the merge result into index | |
| 160 | 160 | cloned_repo.index.commit("Merged past and now into future ;)", | |
| 161 | 161 | parent_commits=(new_branch.commit, master.commit)) | |
0 commit comments