view en/examples/mq.tutorial.qrefresh2.out @ 156:91a936be78b8

Document merge behaviour with file names.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 12 Mar 2007 23:11:26 -0700
parents 006bbad1f190
children 00f69e8825c5
line wrap: on
line source

$ \textbf{echo 'line 3' >> file1}
$ \textbf{hg status}
M file1
$ \textbf{hg qrefresh}
$ \textbf{hg tip --style=compact --patch}
1[qtip,first.patch,tip,qbase]   
  patch queue: first.patch

diff -r  -r  file1


@@ -1,1 +1,3 @@ line 1
 line 1
+line 2
+line 3