Mercurial > hg-stable

diff tests/test-update-branches.t @ 17347:2da47de36b6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: fix check for trailing whitespace on continued lines too The tests in test-annotate.t and test-import-git.t that relied on trailing space in a file created by a here string is now masked by a literal 'EOL' string that is removed.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 08 Aug 2012 18:10:37 +0200
parents bfe89d65d651
children 434e5bd615fc
line wrap: on
line diff
--- a/tests/test-update-branches.t	Wed Aug 08 18:10:30 2012 +0200
+++ b/tests/test-update-branches.t	Wed Aug 08 18:10:37 2012 +0200
@@ -61,7 +61,7 @@
   >     hg up $opt $targetrev
   >     hg parent --template 'parent={rev}\n'
   >     hg stat -S
-  > }    
+  > }
 
   $ norevtest () {
   >     msg=$1
@@ -74,7 +74,7 @@
   >     hg up $opt
   >     hg parent --template 'parent={rev}\n'
   >     hg stat -S
-  > }    
+  > }
 
 Test cases are documented in a table in the update function of merge.py.
 Cases are run as shown in that table, row by row.