Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 00:21:02 +0000 (17:21 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 00:21:02 +0000 (17:21 -0700)
* maint:
  merge-base: Clarify the comments on post processing.
  Update the documentation for git-merge-base


Trivial merge