Mercurial > public > mercurial-scm > hg

diff tests/test-filebranch.t @ 13439:d724a69309e0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: flush stdout before calling external processes stdout could have content in its buffer while a subprocess ran and emitted output. Flushing stdout ensures that output now comes in the right order.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 18 Feb 2011 03:35:01 +0100
parents 4134686b83e1
children ec5886db9dc6
line wrap: on
line diff
--- a/tests/test-filebranch.t	Fri Feb 18 03:34:47 2011 +0100
+++ b/tests/test-filebranch.t	Fri Feb 18 03:35:01 2011 +0100
@@ -55,10 +55,10 @@
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg merge -v
-  merging for foo
   resolving manifests
   getting bar
   merging foo
+  merging for foo
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)