Mercurial > hg-stable

diff tests/test-bundle-r.out @ 4674:723e0ddb6ada

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: warn user about divergent renames
author Matt Mackall <mpm@selenic.com>
date Thu, 21 Jun 2007 18:02:03 -0500
parents a225055b3b59
children 30d4d8985dd8
line wrap: on
line diff
--- a/tests/test-bundle-r.out	Thu Jun 21 22:19:41 2007 +0200
+++ b/tests/test-bundle-r.out	Thu Jun 21 18:02:03 2007 -0500
@@ -197,6 +197,9 @@
 crosschecking files in changesets and manifests
 checking files
 3 files, 7 changesets, 6 total revisions
+warning: detected divergent renames of afile to:
+ anotherfile
+ adifferentfile
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved