![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Aug 2009 18:34:24 +0000 (11:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Aug 2009 18:34:24 +0000 (11:34 -0700) | ||
| commit | 3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c | |
| tree | 91ce5e5495f5d022bebd77ea41bd51970e8ec3db | tree | snapshot |
| parent | d3ebb174ea0881ff1d801174d18271bfc50245e3 | commit | diff |
| parent | c94736a27f89bfc268aed0de7264deecdc136a58 | commit | diff |
Merge branch 'jc/maint-merge-recursive-fix' into maint
* jc/maint-merge-recursive-fix:
merge-recursive: don't segfault while handling rename clashes
* jc/maint-merge-recursive-fix:
merge-recursive: don't segfault while handling rename clashes
| merge-recursive.c | diff1 | | diff2 | | blob | history |