Mercurial > hg

diff tests/test-rename-merge1.t @ 16792:ad394c897b16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: do not warn about copy and rename in the same transaction (issue2113)
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 23 May 2012 17:25:48 +0200
parents efdcce3fd2d5
children 9cbc44a6600e
line wrap: on
line diff
--- a/tests/test-rename-merge1.t	Tue May 22 14:37:20 2012 -0500
+++ b/tests/test-rename-merge1.t	Wed May 23 17:25:48 2012 +0200
@@ -95,9 +95,6 @@
   $ hg up c761c6948de0
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg up
-  note: possible conflict - b was renamed multiple times to:
-   b3
-   b4
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Check for issue2642