Merge branch 'rs/diff-cleanup-records-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)
commit713b85c...58926876af93fcabf4aae83391778195
treebab82ae...2e533f5d6abc201a447d8a5908c3e851copy hash to clipboard (tree)
parent689b047...72030db30d101d43dbef6afd3b703c09copy hash to clipboard (diff)
parent81b568c...39376a10cd5fe29db0b8a72f537fa36acopy hash to clipboard (diff)
diff.c
xdiff/xprepare.c