| commit | 27e4d1a468d281ca699b624501c9213943b98e94 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Aug 2009 04:16:49 +0000 (6 21:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 7 Aug 2009 04:16:49 +0000 (6 21:16 -0700) | ||
| tree | 323c91dc3e4db4d7a50adef8b04d45b8732826c1 | treesnapshot (tar.gz zip) |
| parent | 6bc7c5cff570e8d09a76bdb3283805fb17c97a23 | commitdiff |
| parent | c94736a27f89bfc268aed0de7264deecdc136a58 | commitdiff |
Merge branch 'jc/maint-merge-recursive-fix' into next
* 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 | blobhistory |