]> git.ipfire.org Git - thirdparty/git.git/commit - ll-merge.h
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3d51e1b) | patch
merge-recursive: split low-level merge functions out.
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Dec 2007 08:36:00 +0000 (00:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Feb 2008 08:46:13 +0000 (00:46 -0800)
commit525ab63950e324823dd45423104cdcf5e46e2610
tree4ab4dcee4a942ad6b0877bfc1f508d34932a339atree | snapshot
parent3d51e1b5b84bde24f9a19e3cee603f0b57f62001commit | 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>
Makefile diff | blob | blame | history
ll-merge.c [new file with mode: 0644] blob
ll-merge.h [new file with mode: 0644] blob
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.