Merge branch 'jk/merge-tree-added-identically'
* jk/merge-tree-added-identically: merge-tree: handle directory/empty conflict correctly
Junio C Hamano committed
May 6, 2013 at 22:18 UTC
423ecb0bb66e9d60b6667aebc2844e82205369a1
No changes.