summaryrefslogtreecommitdiff
path: root/tests.branching/merge.script
Commit message (Expand)AuthorAgeFilesLines
* morph merge: Use a special git merge driver for morphology filesSam Thursfield2012-09-271-1/+3
* Disable tests on Debian Squeeze that require Python 2.7Sam Thursfield2012-09-241-0/+7
* morph merge: Don't make a merge commit if only the refs changedSam Thursfield2012-09-141-0/+2
* morph merge: Give consistent commit message in chunk reposSam Thursfield2012-09-111-0/+8
* Rewrite 'merge' commandSam Thursfield2012-09-101-0/+50