![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Dec 2007 08:36:00 +0000 (00:36 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Feb 2008 08:46:13 +0000 (00:46 -0800) | ||
| commit | 525ab63950e324823dd45423104cdcf5e46e2610 | |
| tree | 4ab4dcee4a942ad6b0877bfc1f508d34932a339a | tree | snapshot |
| parent | 3d51e1b5b84bde24f9a19e3cee603f0b57f62001 | commit | diff |
merge-recursive: split low-level merge functions out.
This moves low-level merge functions out of merge-recursive.c and
places them in a new separate file, ll-merge.c
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This moves low-level merge functions out of merge-recursive.c and
places them in a new separate file, ll-merge.c
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Makefile | diff | blob | history | |
| ll-merge.c | [new file with mode: 0644] | blob |
| ll-merge.h | [new file with mode: 0644] | blob |
| merge-recursive.c | diff | blob | history |