diff options
Diffstat (limited to 'tests.merging/conflict-chunks.stdout')
| -rw-r--r-- | tests.merging/conflict-chunks.stdout | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.merging/conflict-chunks.stdout b/tests.merging/conflict-chunks.stdout index bf6d3828..01ae550f 100644 --- a/tests.merging/conflict-chunks.stdout +++ b/tests.merging/conflict-chunks.stdout @@ -1,4 +1,4 @@ -Merge conflicts in baserock:stratum2-hello: +Merge conflicts in test:stratum2-hello: conflict.txt -Merge conflicts in baserock:stratum3-hello: +Merge conflicts in test:stratum3-hello: conflict.txt |