Mercurial > hg

diff tests/test-pull-branch.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 701df761aa94
line wrap: on
line diff
--- a/tests/test-pull-branch.t	Wed Aug 08 21:38:53 2012 +0200
+++ b/tests/test-pull-branch.t	Wed Aug 08 18:10:16 2012 +0200
@@ -142,7 +142,7 @@
   $ hg branch branchC
   marked working directory as branch branchC
   (branches are permanent and global, did you want a bookmark?)
-  $ echo b1 > bar 
+  $ echo b1 > bar
   $ hg ci -Am "commit on branchC on tt"
   adding bar
 
@@ -151,7 +151,7 @@
   $ cd ../t
   $ hg up -C default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ echo a1 > bar 
+  $ echo a1 > bar
   $ hg ci -Am "commit on default on t"
   adding bar