diff --git a/.gitignore b/.gitignore
index bbfa8e16e..cca1f4801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,9 +50,9 @@ UnitTests/TestResults
 TestResults
 
 # git merge files
-.orig
-.theirs
-.ours
+*.orig
+*.theirs
+*.ours
 
 demo.*