projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 53a7085) | patch
merge-recursive: use xdl_merge().
authorJunio C Hamano <junkio@cox.net>
Wed, 29 Nov 2006 20:07:37 +0000 (12:07 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 3 Dec 2006 01:28:19 +0000 (17:28 -0800)
commitc2b4faea4522b28a7611ddab5eb6a5c221cc3ee5
treefacf5b4028eae8d7e20550644fa1bdd9747b32c2tree | snapshot
parent53a7085a104936aef29400369aab15e0d1ccbb28commit | diff
merge-recursive: use xdl_merge().

This seem to pass the existing tests already.

Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c diff | blob | history
Git—the stupid content tracker