diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-27 19:28:21 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-27 19:37:00 +0100 |
| commit | d3685248fb69ff134ce1fceacd801ef78c146bee (patch) | |
| tree | ba4a4326cce2565b10f237e05283d56e827e0e24 /tests.branching/workspace.stdout | |
| parent | 48ff511df6f175e27ca365f644eac60875e09c94 (diff) | |
| download | morph-d3685248fb69ff134ce1fceacd801ef78c146bee.tar.gz | |
Remove obsolete merging hack from merge conflict test
Previously we had to manually use git merge to resolve the ref
conflicts in the morphologies, but the morphology merge driver
now takes care of them.
Diffstat (limited to 'tests.branching/workspace.stdout')
0 files changed, 0 insertions, 0 deletions