hgbook
view it/examples/mq.tutorial.qrefresh.it @ 1019:746a888fb41b
some typo and better french translation
| author | André Sintzoff <andre.sintzoff@gmail.com> |
|---|---|
| date | Mon Nov 30 10:57:42 2009 +0100 (2009-11-30) |
| parents | |
| children |
line source
1 <!-- BEGIN mq.tutorial.qrefresh -->
2 <screen><prompt>$</prompt> <userinput>echo 'riga 2' >> file1</userinput>
3 <prompt>$</prompt> <userinput>hg diff</userinput>
4 diff -r f32697f1a94e file1
5 --- a/file1 Fri Jun 05 15:50:57 2009 +0000
6 +++ b/file1 Fri Jun 05 15:50:58 2009 +0000
7 @@ -1,1 +1,2 @@
8 riga 1
9 +riga 2
10 <prompt>$</prompt> <userinput>hg qrefresh</userinput>
11 <prompt>$</prompt> <userinput>hg diff</userinput>
12 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput>
13 1[qtip,prima.patch,tip,qbase] 18f39bf02ad5 2009-06-05 15:50 +0000 bos
14 [mq]: prima.patch
16 diff -r c6618fa9eed7 -r 18f39bf02ad5 file1
17 --- a/file1 Fri Jun 05 15:50:56 2009 +0000
18 +++ b/file1 Fri Jun 05 15:50:59 2009 +0000
19 @@ -1,1 +1,2 @@
20 riga 1
21 +riga 2
23 </screen>
24 <!-- END mq.tutorial.qrefresh -->