diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:34:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 11:34:24 -0700 |
| commit | 3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c (patch) | |
| tree | 91ce5e5495f5d022bebd77ea41bd51970e8ec3db /diffcore-delta.c | |
| parent | d3ebb174ea0881ff1d801174d18271bfc50245e3 (diff) | |
| parent | c94736a27f89bfc268aed0de7264deecdc136a58 (diff) | |
Merge branch 'jc/maint-merge-recursive-fix' into maint
* jc/maint-merge-recursive-fix:
merge-recursive: don't segfault while handling rename clashes
Diffstat (limited to 'diffcore-delta.c')
0 files changed, 0 insertions, 0 deletions