diff --git a/.gitignore b/.gitignore
index 11c793e1afe..e39c5e13af8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@ target/
 
 # vim
 .*.sw[a-p]
+
+# merge tooling
+*.orig