diff options
Diffstat (limited to 'tests.branching/merge-handles-unmergable-cases.stderr')
| -rw-r--r-- | tests.branching/merge-handles-unmergable-cases.stderr | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/merge-handles-unmergable-cases.stderr b/tests.branching/merge-handles-unmergable-cases.stderr new file mode 100644 index 00000000..513db2b8 --- /dev/null +++ b/tests.branching/merge-handles-unmergable-cases.stderr @@ -0,0 +1 @@ +ERROR: merge conflict: "kind" of morphology hello-stratum |