diff options
| author | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-21 00:33:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 00:33:43 +0200 |
| commit | afcd64ebbb770908bd2a751279ff070dea5bb97c (patch) | |
| tree | 0674f49f45996d533890e0f67498a6038c590168 /git/index/fun.py | |
| parent | aab7dc2c7771118064334ee475dff8a6bb176b57 (diff) | |
| parent | 66c41eb3b2b4130c7b68802dd2078534d1f6bf7a (diff) | |
| download | gitpython-afcd64ebbb770908bd2a751279ff070dea5bb97c.tar.gz | |
Merge pull request #539 from bryant1410/typos
Fix some typos
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 |