From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jul 2010 19:08:41 +0000 (-0700)
Subject: Merge branch 'wp/merge-tree-fix'
X-Git-Tag: v1.7.2~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ea56a7ed971f3bd547abb16a3cb9a41c00133c85?ds=inline;hp=--cc

Merge branch 'wp/merge-tree-fix'

* wp/merge-tree-fix:
merge-tree: fix where two branches share no changes
add basic tests for merge-tree
---

ea56a7ed971f3bd547abb16a3cb9a41c00133c85