hgbook
diff en/examples/tour-merge-conflict @ 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 | bc14f94e726a |
children |
line diff
1.1 --- a/en/examples/tour-merge-conflict Thu Jan 29 22:47:34 2009 -0800 1.2 +++ b/en/examples/tour-merge-conflict Sun Dec 13 16:35:56 2009 +0900 1.3 @@ -56,7 +56,6 @@ 1.4 #$ ignore: [<>]{7} /tmp/.* 1.5 1.6 export HGMERGE=merge 1.7 -echo 'XXX this is broken and must be fixed' 1.8 hg merge 1.9 cat letter.txt 1.10