diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-29 12:07:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-02 17:28:19 -0800 |
| commit | c2b4faea4522b28a7611ddab5eb6a5c221cc3ee5 (patch) | |
| tree | facf5b4028eae8d7e20550644fa1bdd9747b32c2 /xdiff | |
| parent | 53a7085a104936aef29400369aab15e0d1ccbb28 (diff) | |
| download | git-c2b4faea4522b28a7611ddab5eb6a5c221cc3ee5.tar.gz git-c2b4faea4522b28a7611ddab5eb6a5c221cc3ee5.tar.xz | |
merge-recursive: use xdl_merge().
This seem to pass the existing tests already.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions