Mercurial > hg

diff tests/test-rename-merge2.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 bb1800a7d7e1
children f191bc3916f7
line wrap: on
line diff
--- a/tests/test-rename-merge2.out	Thu Jun 21 22:19:41 2007 +0200
+++ b/tests/test-rename-merge2.out	Thu Jun 21 18:02:03 2007 -0500
@@ -173,8 +173,12 @@
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
+ a: divergent renames -> dr
  rev: versions differ -> m
  c: remote created -> g
+warning: detected divergent renames of a to:
+ b
+ c
 getting c
 merging rev
 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337