Merge branch 'sb/merge-friendly'
authorJunio C Hamano <junkio@cox.net>
Sun, 24 Dec 2006 10:18:35 +0000 (02:18 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 24 Dec 2006 10:18:35 +0000 (02:18 -0800)
commite036c90a913889dfa8097ebe73b619370e0c6f32
tree2d910b13395345d9d9bc7c9137d1f6e9bb71d64a
parent9def2138a17325c68961c3b1e6c967d33f28a4f1
parente0ec18192db8a5f80705a81dfaa1caa3e6c48c1a
Merge branch 'sb/merge-friendly'

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