Merge branch 'wp/merge-tree-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:41 +0000 (12:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:41 +0000 (12:08 -0700)
commitea56a7ed971f3bd547abb16a3cb9a41c00133c85
tree774e0039fb71f74ed612014d36ddd50c6014838a
parent4bd874c8f30d55b6189dacf1d769855ed2df4299
parent21baa6e0c56d229866c02c4b42b8b53af648d853
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