summaryrefslogtreecommitdiff
path: root/merge.go
AgeCommit message (Collapse)Author
2014-12-11Remove useless includesCarlos Martín Nieto
2014-12-06Add missing thread lockingCarlos Martín Nieto
2014-12-03Update to masterCarlos Martín Nieto
2014-11-08Fix MergeTrees func to accept nil as ancestor parameterjoseferminj
2014-10-28Make the constants have typesCarlos Martín Nieto
While Go will assign the correct type to a const block when it auto-creates the values, assigning makes the const be typeless and will only gain it in each particular use. Make each constant in the blocks have an assigned type.
2014-05-31Merge: merge analysis now returns the user's preferenceCarlos Martín Nieto
2014-04-04use cast_ptr instead of ptr for travis go tip buildJesse Ezell
2014-04-04merge latest, copy merge bytes to go arrayJesse Ezell
2014-03-26Merge analysis and merge fileJesse Ezell
2014-03-26support nil merge optionsJesse Ezell
2014-03-26update to new merge APIJesse Ezell
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