![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 24 Dec 2006 10:18:35 +0000 (02:18 -0800) | ||
| committer | Junio 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.
Display 'theirs' branch name when possible in merge.
Use extended SHA1 syntax in merge-recursive conflicts.
Trivial merge