summaryrefslogtreecommitdiff
path: root/merge_test.go
AgeCommit message (Expand)Author
2021-02-02Support git_repository_message, git_repository_message_remove (#734)Byoungchan Lee
2020-12-13Support more MergeBase functions (#720)lhchavez
2020-05-09refactor: Rename methods with Get prefixSuhaib Mujahid
2020-02-23Add test and runtime.KeepAlive()lhchavez
2016-08-27Run the tests in parallelCarlos Martín Nieto
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
2015-06-28Create a ReferenceCollection for managing referencesCarlos Martín Nieto
2015-04-24tests: always clean up temporary repository dirsPatrick Steinhardt
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
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-04 22:42:47 +0000