| commit | 3e5261a24071ca23c3514c0ebd5ee55f1e79d9cc | |
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 17 Apr 2007 04:58:01 +0000 (16 21:58 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 17 Apr 2007 08:04:59 +0000 (17 01:04 -0700) | ||
| tree | 81885f6590dd063c6fef7c2c079f1ccf90cc09f4 | treesnapshot (tar.gz zip) |
| parent | 515106fa1335462393c08fa8712dddd767dc147a | commitdiff |
merge-recursive: separate out xdl_merge() interface.
This just moves code around to make the actual call to
xdl_merge() into a separate function.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This just moves code around to make the actual call to
xdl_merge() into a separate function.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |