view ja/examples/mq.tutorial.qrefresh.out @ 776:019040fbf5f5

merged to upstream: phase 1
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 21 Apr 2009 00:36:40 +0900
parents b0db5adf11c1
children
line wrap: on
line source

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


@@ -1,1 +1,2 @@ line 1
 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 1
+line 2