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