From 8ba27c0d9f6ce2edd925f14c734e17f117f32214 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sat, 19 Feb 2011 01:40:29 -0500
Subject: [PATCH] Ignore DiffMerge temporary files.

---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgignore b/.hgignore
index 030bb58b79..20acb94e67 100644
--- a/.hgignore
+++ b/.hgignore
@@ -12,6 +12,7 @@ tests/*.err
 *.idb
 *.pdb
 *.exp
+___*
 .hg
 .hgignore
 .hgtags