From da4de71c658e6fbdc7bb8da1deda07dfb46c15ff Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Sat, 14 Nov 2020 21:07:02 -0300
Subject: [PATCH] ignorar backups de mergetool

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

diff --git a/.gitignore b/.gitignore
index 6b81b8a..856000b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
 *.orig
 *.rej
 *~
+*_LOCAL_*
+*_BASE_*
+*_BACKUP_*
+*_REMOTE_*
 .bundle
 .jekyll-cache
 .sass-cache