diff -r c4388ca5000b -r a2d359154fb7 .hgrc --- a/.hgrc Mon Mar 14 18:05:03 2011 +0200 +++ b/.hgrc Tue Mar 15 11:05:04 2011 +0200 @@ -6,6 +6,7 @@ ; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file. merge = internal:merge editor = emacs -q +ignore = ~/.hgignore [defaults] log = -v