view tests/test-mq-qdiff.out @ 4603:66ed92ed115a

Make fast-forward merges full merges
author Brendan Cully <brendan@kublai.com>
date Mon, 18 Jun 2007 12:38:54 -0700
parents 8ca608c1eb02
children
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