From 1f938b721b762a608efb8faee1913904c2cb1a77 Mon Sep 17 00:00:00 2001
From: Tycho Bickerstaff <work.tycho@gmail.com>
Date: Sun, 22 Dec 2013 16:26:45 +0000
Subject: added mergetool files to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 977122047..b15b6d502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ cloc.xsl
 ## emacs
 *.*~
 *~
+*.orig
 
 # world inside source
 ChunkWorx.ini
-- 
cgit v1.2.3