hgbook

diff en/examples/mq.tutorial.qrefresh2.out @ 254:7301e64c362e

Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed May 30 22:18:04 2007 -0700 (2007-05-30)
parents
children 00f69e8825c5
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/mq.tutorial.qrefresh2.out	Wed May 30 22:18:04 2007 -0700
     1.3 @@ -0,0 +1,16 @@
     1.4 +$ \textbf{echo 'line 3' >> file1}
     1.5 +$ \textbf{hg status}
     1.6 +M file1
     1.7 +$ \textbf{hg qrefresh}
     1.8 +$ \textbf{hg tip --style=compact --patch}
     1.9 +1[qtip,first.patch,tip,qbase]   
    1.10 +  patch queue: first.patch
    1.11 +
    1.12 +diff -r  -r  file1
    1.13 +
    1.14 +
    1.15 +@@ -1,1 +1,3 @@ line 1
    1.16 + line 1
    1.17 ++line 2
    1.18 ++line 3
    1.19 +