Code

Merge branch 'js/merge-base'
authorJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:44:59 +0000 (22:44 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:44:59 +0000 (22:44 -0700)
* js/merge-base:
  Additional merge-base tests (revised)
  merge-base: update the clean-up postprocessing


Trivial merge