summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-09-13 19:20:45 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-09-14 19:44:40 +0100
commit3911c0bea5654a4de7cd9121d89c7f9bc69b0172 (patch)
tree5d21210156899e1317f8a4242d1ca264ae0f9650 /tests.branching
parentf7a3f591a12baa17fa0380ba36405651fe2b0126 (diff)
downloadmorph-3911c0bea5654a4de7cd9121d89c7f9bc69b0172.tar.gz
morph merge: Give full dir instead of repo name in merge errors
There are two copies of each repo involved at this point so we must be clear about which one has an error.
Diffstat (limited to 'tests.branching')
0 files changed, 0 insertions, 0 deletions