view ja/examples/tour.pull.out @ 836:d819bc2414f4

add figs/bad-merge-*.dot. a part of 7226e5e750a6.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 23 Jul 2009 18:10:58 +0900
parents b0db5adf11c1
children
line wrap: on
line source

$ \textbf{hg tip}
changeset:   
tag:         tip
user:        Bryan O'Sullivan <bos@serpentine.com>

summary:     Trim comments.

$ \textbf{hg pull ../my-hello}
pulling from ../my-hello
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
$ \textbf{hg tip}
changeset:   
tag:         tip
user:        Bryan O'Sullivan <bos@serpentine.com>

summary:     Added an extra line of output