![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Jul 2010 19:08:41 +0000 (12:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Jul 2010 19:08:41 +0000 (12:08 -0700) |
* wp/merge-tree-fix:
merge-tree: fix where two branches share no changes
add basic tests for merge-tree
merge-tree: fix where two branches share no changes
add basic tests for merge-tree
Trivial merge