Merge branch 'js/merge-base'
commite40e0135f24a140935c218af43d0bf8b7b07067b
authorJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:44:59 +0000 (12 22:44 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:44:59 +0000 (12 22:44 -0700)
tree6ad7ea4a488b1f61ae16547514130d2292a78f48
parent3939b805f4147a97c08cc50ef7e53cd6c2490c5c
parentcd6f207a445f96966eb119b874306dca291fcd22
Merge branch 'js/merge-base'

* js/merge-base:
  Additional merge-base tests (revised)
  merge-base: update the clean-up postprocessing