view ja/examples/rollback.commit.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 status}
M a
$ \textbf{echo b > b}
$ \textbf{hg commit -m 'Add file b'}