From 66c41eb3b2b4130c7b68802dd2078534d1f6bf7a Mon Sep 17 00:00:00 2001 From: Santiago Castro Date: Thu, 20 Oct 2016 19:20:32 -0300 Subject: Fix some typos --- git/index/fun.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/index/fun.py') 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 -- cgit v1.2.1