view tests/test-mq-qdiff.out @ 4416:bb1800a7d7e1

merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.
author Matt Mackall <mpm@selenic.com>
date Tue, 08 May 2007 02:59:13 -0500
parents 8ca608c1eb02
children 3d1f9dcecdea
line wrap: on
line source

% init
% commit
adding base
% qnew mqbase
% qrefresh
% qdiff
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@ base
-base
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@ base
-base
+patched