From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 May 2013 05:18:25 +0000 (-0700)
Subject: Merge branch 'jk/merge-tree-added-identically'
X-Git-Tag: v1.8.3-rc2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/423ecb0bb66e9d60b6667aebc2844e82205369a1?ds=inline;hp=--cc

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

* jk/merge-tree-added-identically:
merge-tree: handle directory/empty conflict correctly
---

423ecb0bb66e9d60b6667aebc2844e82205369a1