From 116f5c7880ceead16133d51693adc1ca25564049 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 2 Nov 2009 10:01:47 -0800
Subject: added ignores for winmerge cruft

---
 .hgignore | 4 ++++
 1 file changed, 4 insertions(+)

(limited to '.hgignore')

diff --git a/.hgignore b/.hgignore
index 8e02212e79..6357f0afd7 100644
--- a/.hgignore
+++ b/.hgignore
@@ -44,3 +44,7 @@ tarfile_tmp
 ^indra/web/dataservice/lib/shared/vault.*
 ^indra/web/dataservice/vendor.*
 glob:indra/newview/dbghelp.dll
+glob:*.cpp.orig
+glob:*.cpp.bak
+glob:*.h.bak
+glob:*.h.orig
-- 
cgit v1.2.3