--- a/tests/test-stabilize-result.t	Sun Apr 29 19:11:29 2018 +0530
+++ b/tests/test-stabilize-result.t	Sun Apr 29 19:14:41 2018 +0530
@@ -415,7 +415,7 @@
   merge:[17] More addition (2)
   with: [18] More addition (2)
   base: [16] More addition
-  updating to "local" conflict
+  updating to "local" side of the conflict: 0b336205a5d0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at e015aa78acee
   $ glog