Mercurial > hg

diff tests/test-graft.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 a6fe1b9cc68f
children 5ed6a375e9ca
line wrap: on
line diff
--- a/tests/test-graft.t	Wed Dec 12 02:38:14 2012 +0100
+++ b/tests/test-graft.t	Tue Jan 15 02:59:12 2013 +0100
@@ -158,8 +158,8 @@
   resolving manifests
    overwrite: False, partial: False
    ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
+   d: remote is newer -> g
    e: versions differ -> m
-   d: remote is newer -> g
   preserving e for resolve of e
   updating: d 1/2 files (50.00%)
   getting d