hgbook
diff ja/examples/tour.merge.merge.out @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/examples/tour.merge.merge.out Sun Dec 13 16:35:56 2009 +0900 1.3 @@ -0,0 +1,4 @@ 1.4 +$ \textbf{hg merge} 1.5 +merging hello.c 1.6 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved 1.7 +(branch merge, don't forget to commit)