summaryrefslogtreecommitdiff
path: root/merge_test.go
AgeCommit message (Collapse)Author
2021-02-02Support git_repository_message, git_repository_message_remove (#734)Byoungchan Lee
Closes #646
2020-12-13Support more MergeBase functions (#720)lhchavez
This change adds support for MergeBaseMany, MergeBasesMany, and MergeBaseOctopus.
2020-05-09refactor: Rename methods with Get prefixSuhaib Mujahid
It is not Go idiomatic to put Get into the getter's name. https: //golang.org/doc/effective_go.html#Getters Co-Authored-By: lhchavez <[email protected]>
2020-02-23Add test and runtime.KeepAlive()lhchavez
2016-08-27Run the tests in parallelCarlos Martín Nieto
This saves about 1s, or 1/3 of the test runtime. The linking is still much slower, but this we can control.
2015-08-31Update missing bit to the new object modelCarlos Martín Nieto
2015-08-04Merge remote-tracking branch 'origin/master' into nextCarlos Martín Nieto
2015-07-31Wrap MergeBasesCarlos Martín Nieto
While here, test MergeBase as well.
2015-06-28Create a ReferenceCollection for managing referencesCarlos Martín Nieto
As with the other commits, this clears up the clutter in naming and around the Repository's API.
2015-04-24tests: always clean up temporary repository dirsPatrick Steinhardt
Some test repositories are not correctly removed after the tests did run. Fix by introducing a function that is to be used for cleaning up temporary test repositories.
2014-12-03Update to masterCarlos Martín Nieto
2014-11-08Fix MergeTrees func to accept nil as ancestor parameterjoseferminj
2014-05-31Merge: merge analysis now returns the user's preferenceCarlos Martín Nieto
2014-03-26Merge analysis and merge fileJesse Ezell
2014-03-26support nil merge optionsJesse Ezell
2014-03-26update to new merge APIJesse Ezell
2014-02-28Add defaults, add simple test, merge heads should be pointer arrayJesse Ezell