Age | Commit message (Expand) | Author |
---|---|---|
2013-03-07 | change default merge type | Scott Moser |
2013-03-06 | Add some nice docs on what this is. | Joshua Harlow |
2013-03-06 | Continue working on merging code. | Joshua Harlow |
2013-03-05 | Add in a bunch of changes and tests. | Joshua Harlow |
2012-11-22 | Allow mergers to take options. | Joshua Harlow |
2012-11-20 | Start allowing different merging types to be applied | Joshua Harlow |