diff options
Diffstat (limited to 'tests.merging/conflict-chunks.stdout')
| -rw-r--r-- | tests.merging/conflict-chunks.stdout | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests.merging/conflict-chunks.stdout b/tests.merging/conflict-chunks.stdout new file mode 100644 index 00000000..bf6d3828 --- /dev/null +++ b/tests.merging/conflict-chunks.stdout @@ -0,0 +1,4 @@ +Merge conflicts in baserock:stratum2-hello: + conflict.txt +Merge conflicts in baserock:stratum3-hello: + conflict.txt |