projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6bc7c5c c94736a)
Merge branch 'jc/maint-merge-recursive-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Aug 2009 04:16:49 +0000 (21:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Aug 2009 04:16:49 +0000 (21:16 -0700)
commit27e4d1a468d281ca699b624501c9213943b98e94
tree323c91dc3e4db4d7a50adef8b04d45b8732826c1tree | snapshot
parent6bc7c5cff570e8d09a76bdb3283805fb17c97a23commit | diff
parentc94736a27f89bfc268aed0de7264deecdc136a58commit | diff
Merge branch 'jc/maint-merge-recursive-fix' into next

* jc/maint-merge-recursive-fix:
  merge-recursive: don't segfault while handling rename clashes
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.