tests/test-topic-rebase.t
changeset 2683 d22090c6e68f
parent 2679 5156a67f66a6
child 2712 f19b314d8475
--- a/tests/test-topic-rebase.t	Thu Jun 29 02:21:09 2017 +0530
+++ b/tests/test-topic-rebase.t	Thu Jun 29 16:29:08 2017 +0200
@@ -125,7 +125,8 @@
   [1]
 
 Resolve the conflict
-  $ echo "A2\nB" > file
+  $ echo A2 > file
+  $ echo B >> file
   $ hg resolve -m
   (no more unresolved files)
   continue: hg rebase --continue