hgbook
diff en/examples/tour-merge-conflict @ 998:9d32b10fdb1e
updating .hgignore to ignore the same files other translation ignores
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Sat Sep 12 20:52:35 2009 +0200 (2009-09-12) |
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 Sat Sep 12 20:52:35 2009 +0200 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