# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1185482300 25200
# Node ID e6cc4d4f5a8145c02c167233b7ac1ab7d4a18aac
# Parent  c7623d2b2a6657d46fcb3ce388d755ace43f0285
Ignore mergebackup files generated by mpatch

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -4,6 +4,7 @@ syntax: glob
 *.orig
 *.rej
 *~
+*.mergebackup
 *.o
 *.so
 *.pyc