projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 515106f) | patch
merge-recursive: separate out xdl_merge() interface.
authorJunio C Hamano <junkio@cox.net>
Tue, 17 Apr 2007 04:58:01 +0000 (21:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 17 Apr 2007 08:04:59 +0000 (01:04 -0700)
commit3e5261a24071ca23c3514c0ebd5ee55f1e79d9cc
tree81885f6590dd063c6fef7c2c079f1ccf90cc09f4tree | snapshot
parent515106fa1335462393c08fa8712dddd767dc147acommit | diff
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>
merge-recursive.c diff | blob | history
Git—the stupid content tracker