Add diffmerge files to gitignore.

2015-05-26 10:36:57 -04:00
parent 4f396f317e
commit c5e4f3fca8
1 changed files with 4 additions and 0 deletions
@@ -45,6 +45,10 @@ ___*
 .cvsignore
 *.diff
 *.patch
+*_BACKUP_*
+*_BASE_*
+*_LOCAL_*
+*_REMOTE_*

 # Mac Programming Files
 *.pbxuser