| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2014-05-31 | Merge: merge analysis now returns the user's preference | Carlos MartÃn Nieto | |
| 2014-04-04 | use cast_ptr instead of ptr for travis go tip build | Jesse Ezell | |
| 2014-04-04 | merge latest, copy merge bytes to go array | Jesse Ezell | |
| 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-03-11 | remove useless wrappers | Jesse Ezell | |
| 2014-02-28 | Add defaults, add simple test, merge heads should be pointer array | Jesse Ezell | |
| 2014-02-28 | move finalizer above free | Jesse Ezell | |
| 2014-02-28 | switch from iota to explicit def | Jesse Ezell | |
| 2014-02-28 | merge options / merge tree options | Jesse Ezell | |
| 2014-02-28 | wrap merge functions | Jesse Ezell | |
