aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.h
Commit message (Collapse)AuthorAge
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-18
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>