hgbook

annotate ja/examples/branching.update.out @ 1030:2ac31ea48a3d

merge with trunk
author Romain PELISSE <belaran@gmail.com>
date Thu Apr 22 12:39:32 2010 +0200 (2010-04-22)
parents
children
rev   line source
foozy@708 1 $ \textbf{cd ..}
foozy@708 2 $ \textbf{hg clone -U main main-old}
foozy@708 3 $ \textbf{cd main-old}
foozy@708 4 $ \textbf{hg update v1.0}
foozy@708 5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
foozy@708 6 $ \textbf{cat myfile}
foozy@708 7 This is a boring feature.