add merge tool bit to gitignore

2011-10-24 10:56:31 -05:00 · 2011-10-24 10:56:31 -05:00 · ae16ccd918
parent cd0628ab66
commit ae16ccd918
1 changed files with 3 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -31,3 +31,6 @@ target/

 # vim
 .*.sw[a-p]
+
+# merge tooling
+*.orig