Skip to content
Snippets Groups Projects
Commit 116f5c78 authored by richard's avatar richard
Browse files

added ignores for winmerge cruft

parent a857fe1d
No related branches found
No related tags found
No related merge requests found
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment