summaryrefslogtreecommitdiff
path: root/ll-merge.h
AgeCommit message (Expand)Author
2008-02-18merge-recursive: split low-level merge functions out.Junio C Hamano