summaryrefslogtreecommitdiff
path: root/tests.branching/merge.stdout
diff options
context:
space:
mode:
Diffstat (limited to 'tests.branching/merge.stdout')
-rw-r--r--tests.branching/merge.stdout2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/merge.stdout b/tests.branching/merge.stdout
index e5127734..6806f75a 100644
--- a/tests.branching/merge.stdout
+++ b/tests.branching/merge.stdout
@@ -1,5 +1,5 @@
Commit message for baserock:morphs
-Merge system branch 'baserock/newbranch'
+initial
Commit message for baserock:hello
Merge system branch 'baserock/newbranch'