Merge branch 'jc/diff-algo-cleanup' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:19:27 +0000 (11:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 May 2012 18:19:27 +0000 (11:19 -0700)
commit8daff71...ad6caee55e04e5550137cd3bd83b9822
treec265e6d...c6a05ce2f72b6058958f4fac14d79731copy hash to clipboard (tree)
parent07e74b0...a2896ffa6acb5c33f56d7266b35b7ac9copy hash to clipboard (diff)
parent307ab20...333d9b4c818b1ff912e86944d1a3fdc1copy hash to clipboard (diff)
diff.c
diff.h
merge-recursive.c