From c5e4f3fca8b622cc4dce6a4d389aa92155cf5c15 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Tue, 26 May 2015 10:36:57 -0400
Subject: [PATCH] Add diffmerge files to gitignore.

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index e512ce8f31..a3c8f8f6d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,10 @@ ___*
 .cvsignore
 *.diff
 *.patch
+*_BACKUP_*
+*_BASE_*
+*_LOCAL_*
+*_REMOTE_*
 
 # Mac Programming Files
 *.pbxuser