# HG changeset patch # User Oleksandr Gavenko # Date 1300179904 -7200 # Node ID a2d359154fb78fa7078673943d09e57089b66754 # Parent c4388ca5000b2ce6eed8ab4fe1e125cf90a4571c Add ignore file to listen. 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