# HG changeset patch # User Bryan O'Sullivan # Date 1185482300 25200 # Node ID e6cc4d4f5a8145c02c167233b7ac1ab7d4a18aac # Parent c7623d2b2a6657d46fcb3ce388d755ace43f0285 Ignore mergebackup files generated by mpatch diff -r c7623d2b2a66 -r e6cc4d4f5a81 .hgignore --- 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