--- 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