summaryrefslogtreecommitdiff
path: root/tests.merging/basic.stdout
diff options
context:
space:
mode:
Diffstat (limited to 'tests.merging/basic.stdout')
-rw-r--r--tests.merging/basic.stdout4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.merging/basic.stdout b/tests.merging/basic.stdout
index 2bdde644..7acb135c 100644
--- a/tests.merging/basic.stdout
+++ b/tests.merging/basic.stdout
@@ -1,5 +1,5 @@
-Commit message for baserock:morphs
+Commit message for test:morphs
initial
-Commit message for baserock:hello
+Commit message for test:hello
Merge system branch 'test/feature'