diff options
Diffstat (limited to 'git/index/fun.py')
| -rw-r--r-- | git/index/fun.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git/index/fun.py b/git/index/fun.py index 7a7593fe..ddb04138 100644 --- a/git/index/fun.py +++ b/git/index/fun.py @@ -355,7 +355,7 @@ def aggressive_tree_merge(odb, tree_shas): out_append(_tree_entry_to_baseindexentry(theirs, 3)) # END theirs changed # else: - # theirs didnt change + # theirs didn't change # pass # END handle theirs # END handle ours |