Merge branch 'maint'
commit5c87a8c5602eb09810679dd3e0bcfc7ae1fed111
authorJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 00:21:02 +0000 (16 17:21 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 00:21:02 +0000 (16 17:21 -0700)
tree361ea82efc61e4f3bcf7fb275f0b172f90bca606
parent0fa6417c4911e8d252e562d3f58e737d0fdd0228
parentc82a22c39cbc32576f64f5c6b3f24b99ea8149c7
Merge branch 'maint'

* maint:
  merge-base: Clarify the comments on post processing.
  Update the documentation for git-merge-base