Mercurial > hg
view tests/test-mq-qdiff.out @ 7847:30cb79d84352
resolve: keep .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Mar 2009 16:58:41 -0500 |
parents | fb32ae9c76e7 |
children | 561ff8d9e4f0 |
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 % qdiff filename diff -r 67e992f2c4f3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ -base +patched % revert % qpop patch queue now empty % qdelete mqbase % commit 2 adding lines % qnew 2 % qdiff -U 1 diff -r 35fb829491c1 lines --- a/lines +++ b/lines @@ -1,1 +1,3 @@ + + 1 @@ -4,4 +6,4 @@ 4 -hello world -goodbye world +hello world + goodbye world 7 % qdiff -b diff -r 35fb829491c1 lines --- a/lines +++ b/lines @@ -1,9 +1,11 @@ + + 1 2 3 4 -hello world -goodbye world +hello world + goodbye world 7 8 9 % qdiff -U 1 -B diff -r 35fb829491c1 lines --- a/lines +++ b/lines @@ -4,4 +6,4 @@ 4 -hello world -goodbye world +hello world + goodbye world 7 qdiff -w diff -r 35fb829491c1 lines --- a/lines +++ b/lines @@ -1,3 +1,5 @@ + + 1 2 3