From: Junio C Hamano <junkio@cox.net>
Date: Mon, 27 Nov 2006 06:19:56 +0000 (-0800)
Subject: Merge branch 'jc/merge'
X-Git-Tag: v1.5.0-rc0~214
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88ffc1f28a8b86969c7cbc54b0e3279d8cfe90a8;p=git.git

Merge branch 'jc/merge'

* branch 'jc/merge':
  git-merge: do not leak rev-parse output used for checking internally.
  git-merge: tighten error checking.
  merge: allow merging into a yet-to-be-born branch.
  git-merge: make it usable as the first class UI
  remove merge-recursive-old
---

88ffc1f28a8b86969c7cbc54b0e3279d8cfe90a8