aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.h
Commit message (Expand)AuthorAge
* git merge -X<option>Avery Pennarun2010-01-17
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-18