Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 23:50:31 +0000 (16:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 23:50:31 +0000 (16:50 -0700)
commitd1c8c0c...c42912eb768a05115c798de50e595f8b
tree6fdc20e...a100a21c0c9dbae6bcb0ab9e543a4fedcopy hash to clipboard (tree)
parent3e8a00a...1d529e61f38f36fdb504902064cf1f5dcopy hash to clipboard (diff)
parenta2dc04b...159def766ee17db00c60bdbda477955dcopy hash to clipboard (diff)
combine-diff.c