.hgignore
changeset 5019 e6cc4d4f5a81
parent 2987 12d1475b48df
child 5622 ea2625655baf
--- a/.hgignore	Thu Jul 26 13:36:53 2007 -0700
+++ b/.hgignore	Thu Jul 26 13:38:20 2007 -0700
@@ -4,6 +4,7 @@
 *.orig
 *.rej
 *~
+*.mergebackup
 *.o
 *.so
 *.pyc