Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Split merge tests out from the other branching tests | Sam Thursfield | 2012-10-29 | 1 | -2/+0 |
* | morph merge: Rework how we interact with git | Sam Thursfield | 2012-10-03 | 1 | -6/+2 |
* | morph merge: Use a special git merge driver for morphology files | Sam Thursfield | 2012-09-27 | 1 | -2/+1 |
* | Add merge conflict tests | Sam Thursfield | 2012-09-25 | 1 | -0/+7 |