| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 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 | |
