From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Apr 2013 18:49:31 +0000 (-0700)
Subject: Merge branch 'jk/merge-tree-added-identically'
X-Git-Tag: v1.8.3-rc0~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7e656c09ab6bb0eda6312045cb5d61448309bcb;p=thirdparty%2Fgit.git

Merge branch 'jk/merge-tree-added-identically'

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"
---

e7e656c09ab6bb0eda6312045cb5d61448309bcb