aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-06 14:50:47 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-06 14:50:47 -0700
commitb807c524df69fb44d7fe2a68a899985a7f7e6838 (patch)
treef450071166fb2c29e5bd40ba5820e23b62df4b23 /combine-diff.c
parent4a8295f582ce6ea643dc113038d30a8e1e3f40b9 (diff)
parent0ae08401beb0daef9946b6fe25224a4cf167c655 (diff)
downloadgit-b807c524df69fb44d7fe2a68a899985a7f7e6838.tar.gz
git-b807c524df69fb44d7fe2a68a899985a7f7e6838.tar.xz
Merge branch 'da/maint-python-startup'
* da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions