Merge branch 'jc/combine' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 4 Apr 2006 22:00:34 +0000 (15:00 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 4 Apr 2006 22:00:34 +0000 (15:00 -0700)
commitca3874a...7036cd783ceccc0b6f0e588d84b20223
tree9bfe2d2...c4484b3942388bce4b5e43d136ab7d64copy hash to clipboard (tree)
parent46e48c3...043447b9739cdd7cae768dc53b5bc89dcopy hash to clipboard (diff)
parentf23fc77...a2acce9966ac7fa267818d5be55667facopy hash to clipboard (diff)