From d64029c6ace37488197c801b100d13ddd0b3bd3f Mon Sep 17 00:00:00 2001
From: Misha Brukman <mbrukman@google.com>
Date: Fri, 27 Nov 2015 20:10:21 +0000
Subject: [PATCH] Added support for Vim and Emacs.

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

diff --git a/.gitignore b/.gitignore
index 882b67e2..a107f43f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,15 +4,20 @@ target
 # ignore output files from testing
 output*
 
-# ignore standard eclipse
+# ignore standard Eclipse files
 .project
 .classpath
 .settings
 .checkstyle
 
-# ignore standard intellij
+# ignore standard IntelliJ files
 .idea/
 *.iml
 *.iws
 
+# ignore standard Vim and Emacs temp files
+*.swp
+*~
+
+# ignore standard Mac OS X files/dirs
 .DS_Store