![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Aug 2009 05:17:01 +0000 (22:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Aug 2009 05:17:01 +0000 (22:17 -0700) | ||
| commit | 14468ab45bae83ad300f17f41fe8fd555329ee5e | |
| tree | 0f6bcb7b16ac48757a3add8054f38ebe50819b0d | tree | snapshot |
| parent | 9c5164032f4c25090e6139a202825febb830feea | commit | diff |
| parent | c94736a27f89bfc268aed0de7264deecdc136a58 | commit | diff |
Merge branch 'jc/maint-merge-recursive-fix'
* 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 |