| commit | 423ecb0bb66e9d60b6667aebc2844e82205369a1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 7 May 2013 05:18:25 +0000 (6 22:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 7 May 2013 05:18:25 +0000 (6 22:18 -0700) | ||
| tree | d7cb4f8790f1258eb4495cfae39b74e9d4fd7bcd | treesnapshot (tar.gz zip) |
| parent | bba536718381705507ecc4f944c340312f93e739 | commitdiff |
| parent | 94883b4302118fe6ea50028d02bb453c9af38b66 | commitdiff |
Merge branch 'jk/merge-tree-added-identically'
* jk/merge-tree-added-identically:
merge-tree: handle directory/empty conflict correctly
* jk/merge-tree-added-identically:
merge-tree: handle directory/empty conflict correctly