Merge branch 'ar/merge-recursive'
authorJunio C Hamano <junkio@cox.net>
Fri, 12 Jan 2007 00:48:28 +0000 (16:48 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 12 Jan 2007 00:48:28 +0000 (16:48 -0800)
commit141d21b...256ef96bbd693fd35e154787365e26dc
tree28889e6...1995328e4f2747a8605694ab14456e2bcopy hash to clipboard (tree)
parentc388761...153bc3e874e75f69ff77430164c038c4copy hash to clipboard (diff)
parent8b944b5...78efcbbbedfd555e5eef1500dc6074d1copy hash to clipboard (diff)