Mercurial > public > mercurial-scm > hg

diff tests/test-issue522.t @ 18631:e2dc5397bc82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update test output (will be folded into parent)
author Bryan O'Sullivan <bryano@fb.com>
date Sat, 09 Feb 2013 15:22:04 -0800
parents bcf29565d89f
children 7e9cbb9c6053
line wrap: on
line diff
--- a/tests/test-issue522.t	Sat Feb 09 15:21:58 2013 -0800
+++ b/tests/test-issue522.t	Sat Feb 09 15:22:04 2013 -0800
@@ -32,8 +32,8 @@
    branchmerge: True, force: False, partial: False
    ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
    foo: remote is newer -> g
+  getting foo
   updating: foo 1/1 files (100.00%)
-  getting foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)