From 2bb6349ade3e4f66f102e0d76c875155276ecb06 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Thu, 26 May 2011 17:38:03 -0400
Subject: [PATCH] Ignore DiffMerge comparison files.

...or was this something else?

Either way, no place here.
---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgignore b/.hgignore
index c948c06fe5..2d684e1742 100644
--- a/.hgignore
+++ b/.hgignore
@@ -14,6 +14,7 @@ ffmpeg-*
 *.pdb
 *.exp
 *.dmg
+*.orig
 ___*
 .hg
 .hgignore