From: Junio C Hamano <junkio@cox.net>
Date: Sun, 24 Dec 2006 10:18:35 +0000 (-0800)
Subject: Merge branch 'sb/merge-friendly'
X-Git-Tag: v1.5.0-rc0~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e036c90a913889dfa8097ebe73b619370e0c6f32;p=git.git

Merge branch 'sb/merge-friendly'

* sb/merge-friendly:
  Display 'theirs' branch name when possible in merge.
  Use extended SHA1 syntax in merge-recursive conflicts.
---

e036c90a913889dfa8097ebe73b619370e0c6f32