diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-29 16:02:42 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-29 18:19:26 +0000 |
| commit | 1342bf9006f28a08d1b32dc8218717ebda701dc2 (patch) | |
| tree | 0872d902b6ad4af6c4e238a28bc0c01624c62e0b /tests.merging/conflict-chunks.stdout | |
| parent | 9e4159ba97862c78a9cfa3e3816f18c708ccba5e (diff) | |
| download | morph-1342bf9006f28a08d1b32dc8218717ebda701dc2.tar.gz | |
Split merge tests out from the other branching tests
Merge is by far the most complex of the branching and merging commands.
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 |