]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c1964a0) | patch
merge-recur: if there is no common ancestor, fake empty one
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 9 Aug 2006 16:43:03 +0000 (18:43 +0200)
committerJunio C Hamano <junkio@cox.net>
Wed, 9 Aug 2006 21:54:00 +0000 (14:54 -0700)
commit934d9a24078e65111e9946ad3449c3fa9c06475e
tree2d3c0a364e51a392785bde9508efcede26543828tree | snapshot
parentc1964a006f9035cbdc6de8e55768fc6ad00d4825commit | diff
merge-recur: if there is no common ancestor, fake empty one

This fixes the coolest merge ever.

[jc: with two "Oops that's not it" fixes from Johannes and Alex,
 and an obvious type mismatch fix.]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.