Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Split merge tests out from the other branching tests | Sam Thursfield | 2012-10-29 | 1 | -69/+0 |
* | morph merge: Use a special git merge driver for morphology files | Sam Thursfield | 2012-09-27 | 1 | -1/+3 |
* | Disable tests on Debian Squeeze that require Python 2.7 | Sam Thursfield | 2012-09-24 | 1 | -0/+7 |
* | morph merge: Don't make a merge commit if only the refs changed | Sam Thursfield | 2012-09-14 | 1 | -0/+2 |
* | morph merge: Give consistent commit message in chunk repos | Sam Thursfield | 2012-09-11 | 1 | -0/+8 |
* | Rewrite 'merge' command | Sam Thursfield | 2012-09-10 | 1 | -0/+50 |