From ae16ccd9189914c5c9cd0bca63bb497901249a52 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Mon, 24 Oct 2011 10:56:31 -0500 Subject: [PATCH] add merge tool bit to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) 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