[tor-commits] [bridgedb/master] Add git mergetool backup and save files to the .gitignore.

[isis at torproject.org]

commit 72fee1a0842e05c58217c7fc0a76688744e34c90
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Aug 9 13:31:42 2013 +0000

    Add git mergetool backup and save files to the .gitignore.
---
 .gitignore |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 643f075..c10e075 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,10 @@ nosetests.xml
 .\#*
 *~
 
+# Git mergetool backups and save files
+*.orig
+*.bak
+
 # Mr Developer
 .mr.developer.cfg
 .project