summaryrefslogtreecommitdiff
path: root/merge_test.go
AgeCommit message (Expand)Author
2014-03-26update to new merge APIJesse Ezell
2014-02-28Add defaults, add simple test, merge heads should be pointer arrayJesse Ezell