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.
Junio C Hamano committed
Jan 1, 2007 at 14:40 UTC
9066f4ef2fe27b7636094c06d2361820cd31e03e
No changes.