hgbook
diff ja/examples/mq.tutorial.qrefresh.out @ 992:8b0f1e2984d0
French translation : sync with original ch04-concepts
author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
---|---|
date | Fri Sep 11 14:30:20 2009 +0200 (2009-09-11) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/examples/mq.tutorial.qrefresh.out Fri Sep 11 14:30:20 2009 +0200 1.3 @@ -0,0 +1,21 @@ 1.4 +$ \textbf{echo 'line 2' >> file1} 1.5 +$ \textbf{hg diff} 1.6 +diff -r file1 1.7 + 1.8 + 1.9 +@@ -1,1 +1,2 @@ line 1 1.10 + line 1 1.11 ++line 2 1.12 +$ \textbf{hg qrefresh} 1.13 +$ \textbf{hg diff} 1.14 +$ \textbf{hg tip --style=compact --patch} 1.15 +1[qtip,first.patch,tip,qbase] 1.16 + [mq]: first.patch 1.17 + 1.18 +diff -r -r file1 1.19 + 1.20 + 1.21 +@@ -1,1 +1,2 @@ line 1 1.22 + line 1 1.23 ++line 2 1.24 +