Mercurial > hg

diff tests/test-rebase-conflicts.t @ 17345:4f8054d3171b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: fix check for trailing whitespace on sh command lines The $ has been without necessary escaping since introduced in c7d23b4ca4ba.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 08 Aug 2012 18:10:16 +0200
parents f2719b387380
children 72412afe4c28
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Wed Aug 08 21:38:53 2012 +0200
+++ b/tests/test-rebase-conflicts.t	Wed Aug 08 18:10:16 2012 +0200
@@ -69,7 +69,7 @@
 
 Try to continue without solving the conflict:
 
-  $ hg rebase --continue 
+  $ hg rebase --continue
   abort: unresolved merge conflicts (see hg help resolve)
   [255]