From 7dbdd65740ba16b9ad03898a07d1a7bc4e55c39e Mon Sep 17 00:00:00 2001
From: yossizap <yossizap@gmail.com>
Date: Thu, 19 Dec 2019 12:00:07 +0000
Subject: [PATCH] Updated .gitignore with vim and git mergetool extensions
 (#1947)

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

diff --git a/.gitignore b/.gitignore
index f0c13de6..f3d07391 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,10 @@ CMakeLists.txt.user
 
 # Vim
 *.swp
+*~
+
+# Git mergetool
+~.orig
 
 # CMake Files:
 src/*_automoc.cpp