view en/examples/mq.tutorial.qrefresh.out @ 427:b7d284121f21

merge from somewhere else

$ \textbf{echo 'line 2' >> file1}
$ \textbf{hg diff}
diff -r  file1


@@ -1,1 +1,2 @@
 line 1
+line 2
$ \textbf{hg qrefresh}
$ \textbf{hg diff}
$ \textbf{hg tip --style=compact --patch}
1[qtip,first.patch,tip,qbase]   
  [mq]: first.patch

diff -r  -r  file1


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