# HG changeset patch # User Pierre-Yves David # Date 1498746548 -7200 # Node ID d22090c6e68f45fba813c205d40ba99fb75bce90 # Parent a6e3c2fcb1d7db5eee786a0e52fc6db0956897f8 tests: use a more portable form for new lines diff -r a6e3c2fcb1d7 -r d22090c6e68f tests/test-topic-rebase.t --- 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