From 240795ab70d56dff152f4ebc3bba277f3d4edc88 Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@unity3d.com>
Date: Sun, 1 Jan 2017 19:54:16 +0000
Subject: [PATCH] Ignore VI swap files and GIT merge files

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

diff --git a/.gitignore b/.gitignore
index c053adefb..844b57861 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,8 @@ obj/
 *.sdf
 *.suo
 *.dll
+*.swp
+*.orig
 symsrv.yes
 ipch/
 renderdoc/driver/vulkan/renderdoc_capture.json