Andrew's git / gitweb.git / diff
?
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)
* sb/merge-friendly:
Display 'theirs' branch name when possible in merge.
Use extended SHA1 syntax in merge-recursive conflicts.

Trivial merge