Andrew's git / gitweb.git / diff
?
Merge branch 'jk/merge-tree-added-identically'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Apr 2013 18:49:31 +0000 (11:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Apr 2013 18:49:31 +0000 (11:49 -0700)
The resolution of some corner cases by "git merge-tree" were
inconsistent between top-of-the-tree and in a subdirectory.

* jk/merge-tree-added-identically:
merge-tree: don't print entries that match "local"

Trivial merge