Mercurial > hg
view tests/test-mq-qdiff.out @ 7117:ceb8aef03aa7
Document email.charsets in hgrc.5
hgrc.5.ja.txt probably should include an example like:
[email]
charsets = iso-8859-1, iso-8859-15, windows-1252, iso-8859-2,
windows-1250, iso-2022-jp, iso-2022-jp-ms
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Thu, 16 Oct 2008 17:08:46 +0200 |
parents | 034f444902d9 |
children | fb32ae9c76e7 |
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