projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bd874c 21baa6e)
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)
* wp/merge-tree-fix:
  merge-tree: fix where two branches share no changes
  add basic tests for merge-tree


Trivial merge
Git—the stupid content tracker