summaryrefslogtreecommitdiff
path: root/morph
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-09-27 18:41:19 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-09-27 19:22:22 +0100
commitfcf40483bfab8c902ff5c09214a8ca768303eb98 (patch)
tree3925d5a49bc64df7eef8782a364a3835bba4f7df /morph
parentc821535c6290e47cabf85691b41d6b7dd20a7982 (diff)
downloadmorph-fcf40483bfab8c902ff5c09214a8ca768303eb98.tar.gz
morph merge: Error message wrangling
These do need to be quite clear, because merge failures will happen a lot and we are relatively unhelpful at the moment.
Diffstat (limited to 'morph')
0 files changed, 0 insertions, 0 deletions