summaryrefslogtreecommitdiff
path: root/src/merge.h
Commit message (Expand)AuthorAgeFilesLines
* update copyrightsEdward Thomson2013-01-081-1/+1
* MERGE_HEAD contents iteratorEdward Thomson2013-01-031-0/+1
* expose merge metadata cleanupEdward Thomson2013-01-031-1/+0
* Move merge functions to merge.cBen Straub2012-11-271-0/+3
* reset changes for mergeEdward Thomson2012-10-241-0/+19