| commit | c2b4faea4522b28a7611ddab5eb6a5c221cc3ee5 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 29 Nov 2006 20:07:37 +0000 (29 12:07 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 3 Dec 2006 01:28:19 +0000 (2 17:28 -0800) | ||
| tree | facf5b4028eae8d7e20550644fa1bdd9747b32c2 | treesnapshot (tar.gz zip) |
| parent | 53a7085a104936aef29400369aab15e0d1ccbb28 | commitdiff |
merge-recursive: use xdl_merge().
This seem to pass the existing tests already.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This seem to pass the existing tests already.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |