]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9c51640 c94736a)
Merge branch 'jc/maint-merge-recursive-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Aug 2009 05:17:01 +0000 (22:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Aug 2009 05:17:01 +0000 (22:17 -0700)
commit14468ab45bae83ad300f17f41fe8fd555329ee5e
tree0f6bcb7b16ac48757a3add8054f38ebe50819b0dtree | snapshot
parent9c5164032f4c25090e6139a202825febb830feeacommit | diff
parentc94736a27f89bfc268aed0de7264deecdc136a58commit | diff
Merge branch 'jc/maint-merge-recursive-fix'

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