diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-06 22:18:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-06 22:18:25 -0700 |
| commit | 423ecb0bb66e9d60b6667aebc2844e82205369a1 (patch) | |
| tree | d7cb4f8790f1258eb4495cfae39b74e9d4fd7bcd /gitweb/gitweb.perl | |
| parent | bba536718381705507ecc4f944c340312f93e739 (diff) | |
| parent | 94883b4302118fe6ea50028d02bb453c9af38b66 (diff) | |
Merge branch 'jk/merge-tree-added-identically'
* jk/merge-tree-added-identically:
merge-tree: handle directory/empty conflict correctly
Diffstat (limited to 'gitweb/gitweb.perl')
0 files changed, 0 insertions, 0 deletions