]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d3ebb17 c94736a)
Merge branch 'jc/maint-merge-recursive-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Aug 2009 18:34:24 +0000 (11:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Aug 2009 18:34:24 +0000 (11:34 -0700)
commit3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c
tree91ce5e5495f5d022bebd77ea41bd51970e8ec3dbtree | snapshot
parentd3ebb174ea0881ff1d801174d18271bfc50245e3commit | diff
parentc94736a27f89bfc268aed0de7264deecdc136a58commit | diff
Merge branch 'jc/maint-merge-recursive-fix' into maint

* 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.