From: Junio C Hamano <junkio@cox.net>
Date: Mon, 1 Jan 2007 22:40:37 +0000 (-0800)
Subject: Merge branch 'sp/merge' (early part)
X-Git-Tag: v1.5.0-rc1~114
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9066f4ef2fe27b7636094c06d2361820cd31e03e;p=git.git

Merge branch 'sp/merge' (early part)

* 'sp/merge' (early part):
  Use merge-recursive in git-am -3.
  Allow merging bare trees in merge-recursive.
  Move better_branch_name above get_ref in merge-recursive.
---

9066f4ef2fe27b7636094c06d2361820cd31e03e