diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-08-30 13:49:33 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-08-30 13:49:33 +0100 |
| commit | 15eef533406cee3811650f96897724b4fba5c18c (patch) | |
| tree | 65ade50ceb174765f77b8f87bdac131b947ff52b /tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr | |
| parent | c510c12be2d32a8ab18f7350d8f2a708e74cfa4a (diff) | |
| parent | 17e4c4c0bad5589dabf67156afdfe9dc4e8f218b (diff) | |
| download | morph-15eef533406cee3811650f96897724b4fba5c18c.tar.gz | |
Merge branch 'jannis/initial-branch-and-merge-work'
Conflicts:
morphlib/plugins/branch_and_merge_plugin.py
Diffstat (limited to 'tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr')
| -rw-r--r-- | tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr new file mode 100644 index 00000000..7c784733 --- /dev/null +++ b/tests.branching/show-system-branch-fails-when-branch-is-ambiguous.stderr @@ -0,0 +1 @@ +ERROR: Can't find the system branch directory |