Mercurial > evolve

changeset 2683:d22090c6e68f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use a more portable form for new lines
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 29 Jun 2017 16:29:08 +0200
parents a6e3c2fcb1d7
children 90e11985d0cc
files tests/test-topic-rebase.t
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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