| Age | Commit message (Expand) | Author |
|---|---|---|
| 2016-08-27 | Run the tests in parallel | Carlos Martín Nieto |
| 2015-08-31 | Update missing bit to the new object model | Carlos Martín Nieto |
| 2015-08-04 | Merge remote-tracking branch 'origin/master' into next | Carlos Martín Nieto |
| 2015-07-31 | Wrap MergeBases | Carlos Martín Nieto |
| 2015-06-28 | Create a ReferenceCollection for managing references | Carlos Martín Nieto |
| 2015-04-24 | tests: always clean up temporary repository dirs | Patrick Steinhardt |
| 2014-12-03 | Update to master | Carlos Martín Nieto |
| 2014-11-08 | Fix MergeTrees func to accept nil as ancestor parameter | joseferminj |
| 2014-05-31 | Merge: merge analysis now returns the user's preference | Carlos Martín Nieto |
| 2014-03-26 | Merge analysis and merge file | Jesse Ezell |
| 2014-03-26 | support nil merge options | Jesse Ezell |
| 2014-03-26 | update to new merge API | Jesse Ezell |
| 2014-02-28 | Add defaults, add simple test, merge heads should be pointer array | Jesse Ezell |
 |
index : go.wit.com/lib/libgit2.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiff |
path: root/merge_test.go