hgbook
diff ja/examples/tour.merge.pull.out @ 1015:ef0132c0a014
some typo and better french translation
author | André Sintzoff <andre.sintzoff@gmail.com> |
---|---|
date | Tue Nov 24 15:52:19 2009 +0100 (2009-11-24) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/examples/tour.merge.pull.out Tue Nov 24 15:52:19 2009 +0100 1.3 @@ -0,0 +1,8 @@ 1.4 +$ \textbf{hg pull ../my-hello} 1.5 +pulling from ../my-hello 1.6 +searching for changes 1.7 +adding changesets 1.8 +adding manifests 1.9 +adding file changes 1.10 +added 1 changesets with 1 changes to 1 files (+1 heads) 1.11 +(run 'hg heads' to see heads, 'hg merge' to merge)