summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-02 10:01:47 -0800
committerrichard <none@none>2009-11-02 10:01:47 -0800
commit116f5c7880ceead16133d51693adc1ca25564049 (patch)
tree0eac861cac4344155a28756bbeb0024bd3ec272a
parenta857fe1d82c82dfbebbcf1102f0f5ad06a396d60 (diff)
added ignores for winmerge cruft
-rw-r--r--.hgignore4
1 files changed, 4 insertions, 0 deletions
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