diff --git a/.gitignore b/.gitignore
index f0c13de6..f3d07391 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,10 @@ CMakeLists.txt.user
 
 # Vim
 *.swp
+*~
+
+# Git mergetool
+~.orig
 
 # CMake Files:
 src/*_automoc.cpp