view tests/test-mq-qdiff.out @ 6014:2f424fc4edb3

mergetools: correct vim typo
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Feb 2008 09:53:10 -0600
parents 3d1f9dcecdea
children 034f444902d9
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
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched