Merge branch 'ag/maint-combine-diff-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:32:18 +0000 (14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 21:32:18 +0000 (14:32 -0700)
commitfb70928...7962af168a76f6d8cbab02150daa0b5a
tree07c57aa...5c65acfc9b40e2abca17d4103699fe92copy hash to clipboard (tree)
parent97e5f49...8dd22c99e825ccb254f05a61fda8d19ccopy hash to clipboard (diff)
parent5e568f9...3027797842807213ce590140c9daf9cecopy hash to clipboard (diff)