Merge branch 'jc/merge'
authorJunio C Hamano <junkio@cox.net>
Mon, 27 Nov 2006 06:19:56 +0000 (22:19 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Nov 2006 06:19:56 +0000 (22:19 -0800)
commit88ffc1f...8a8b86969c7cbc54b0e3279d8cfe90a8
tree3c46186...be7704f2701c69ae006d1bc1d1e74bf4copy hash to clipboard (tree)
parentd63afe9...bb9b27952d3c29215a246b252f2d80f9copy hash to clipboard (diff)
parentc175161...381b6e8c8eae311107b5969a0233a6d8copy hash to clipboard (diff)