diff options
| author | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-22 12:47:45 +0200 |
|---|---|---|
| committer | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-22 12:47:45 +0200 |
| commit | a25365fea0ea3b92ba96cc281facd308311def1e (patch) | |
| tree | 5653a9923aebfc8b53407f8d1ef0d9d6497da081 /git/index/fun.py | |
| parent | 76ac61a2b4bb10c8434a7d6fc798b115b4b7934d (diff) | |
| parent | caa0ea7a0893fe90ea043843d4e6ad407126d7b8 (diff) | |
| download | gitpython-a25365fea0ea3b92ba96cc281facd308311def1e.tar.gz | |
Merge remote-tracking branch 'origin/master' into exp_git_dir
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 d9c0f215..7f7518e1 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 |