dot/emacs: Don't automatically stage files after resolving conflicts.

[profile] / git / gitignore

diff --git a/git/gitignore b/git/gitignore
index 0040d07..30d9687 100644 (file)
--- a/git/gitignore
+++ b/git/gitignore
@@ -33,3 +33,4 @@ GTAGS
 /debian/*.log
 /debian/autoreconf.*
 /debian/debhelper-build-stamp
+/debian/build/