summaryrefslogtreecommitdiff
path: root/ll-merge.h
Commit message (Expand)AuthorAgeFilesLines
* git merge -X<option>Avery Pennarun2010-01-171-1/+1
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-181-0/+15