summaryrefslogtreecommitdiff
path: root/merge.go
AgeCommit message (Collapse)Author
2014-03-11remove useless wrappersJesse Ezell
2014-02-28Add defaults, add simple test, merge heads should be pointer arrayJesse Ezell
2014-02-28move finalizer above freeJesse Ezell
2014-02-28switch from iota to explicit defJesse Ezell
2014-02-28merge options / merge tree optionsJesse Ezell
2014-02-28wrap merge functionsJesse Ezell