.hgignore
changeset 5344 cc34be74eeec
parent 5019 e6cc4d4f5a81
--- a/.hgignore
+++ b/.hgignore
@@ -4,6 +4,7 @@ syntax: glob
 *.orig
 *.rej
 *~
+*.mergebackup
 *.o
 *.so
 *.pyc