Updated .gitignore with vim and git mergetool extensions (#1947)

This commit is contained in:
yossizap 2019-12-19 12:00:07 +00:00 committed by xarkes
parent 78c6e651c8
commit 7dbdd65740

4
.gitignore vendored
View File

@ -43,6 +43,10 @@ CMakeLists.txt.user
# Vim # Vim
*.swp *.swp
*~
# Git mergetool
~.orig
# CMake Files: # CMake Files:
src/*_automoc.cpp src/*_automoc.cpp