Mercurial > public > mercurial-scm > hg-stable

diff tests/test-update-reverse.t @ 18360:760c0d67ce5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: process files in sorted order
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 02:59:12 +0100
parents efdcce3fd2d5
children bcf29565d89f
line wrap: on
line diff
--- a/tests/test-update-reverse.t	Wed Dec 12 02:38:14 2012 +0100
+++ b/tests/test-update-reverse.t	Tue Jan 15 02:59:12 2013 +0100
@@ -68,8 +68,8 @@
   resolving manifests
    overwrite: True, partial: False
    ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
+   side1: other deleted -> r
    side2: other deleted -> r
-   side1: other deleted -> r
    main: remote created -> g
   updating: side1 1/3 files (33.33%)
   removing side1