tests/test-mq-qdiff.out
author Matt Mackall <mpm@selenic.com>
Mon, 09 Oct 2006 23:23:25 -0500
changeset 3309 488d3062d225
parent 2904 8ca608c1eb02
permissions -rw-r--r--
merge: eliminate nodes from action list - eliminate my and other from merge and copy - eliminate node from get - use mctx for get - fix bug flag = a[2:] - pass mctx to recordupdates - use new filectx.size in recordupdates

% 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