hgbook
diff en/examples/tour-merge-conflict.cousin.out @ 443:2daeda01fe98
Started mq, please do look the translation terms about push and pop on this context
| author | Igor TAmara <igor@tamarapatino.org> |
|---|---|
| date | Sun Dec 07 17:47:38 2008 -0500 (2008-12-07) |
| parents | 006bbad1f190 |
| children |
line diff
1.1 --- a/en/examples/tour-merge-conflict.cousin.out Tue Mar 06 21:44:56 2007 -0800 1.2 +++ b/en/examples/tour-merge-conflict.cousin.out Sun Dec 07 17:47:38 2008 -0500 1.3 @@ -1,5 +1,6 @@ 1.4 $ \textbf{cd ..} 1.5 $ \textbf{hg clone scam scam-cousin} 1.6 +updating working directory 1.7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.8 $ \textbf{cd scam-cousin} 1.9 $ \textbf{cat > letter.txt <<EOF}