From 9b3aa4bdad4474a9ee5ada70b5481b22a6182b50 Mon Sep 17 00:00:00 2001
From: Guillaume DOTT <guillaume.dott@lafourmi-immo.com>
Date: Tue, 22 Oct 2013 17:07:42 +0200
Subject: [PATCH] git: disable backup for mergetool

---
 git/gitconfig.include | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/gitconfig.include b/git/gitconfig.include
index 6a4480b..00332cb 100644
--- a/git/gitconfig.include
+++ b/git/gitconfig.include
@@ -15,6 +15,8 @@
 	tool = vimdiff
 [merge]
 	tool = meld
+[mergetool]
+	keepBackup = false
 [credential]
 	helper = cache
 # vim: set filetype=gitconfig: