aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.h
Commit message (Expand)AuthorAge
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-18