From 51e8fa277ec7a1a588798a6d82916411cb30745b Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Mon, 3 Feb 2014 14:39:12 +0100
Subject: [PATCH] no backup files after merge

---
 .gitconfig.cygwin          | 1 -
 .gitconfig_includes.common | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitconfig.cygwin b/.gitconfig.cygwin
index 75e8c914..54c16fa8 100644
--- a/.gitconfig.cygwin
+++ b/.gitconfig.cygwin
@@ -2,4 +2,3 @@
 	path = dev/dotfiles/.gitconfig_includes.common
 	path = dev/dotfiles/.gitconfig_includes.cygwin
 
-
diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common
index b34cf7f7..c54a73dd 100644
--- a/.gitconfig_includes.common
+++ b/.gitconfig_includes.common
@@ -11,4 +11,5 @@
 	pager = cat
 [alias]
     tree = log --show-signature --color --decorate --date=short --all --graph -n 6
-
+[mergetool]
+	keepBackup = false