From 25ea85f5a13f4c8a7a6bb05aa35ba54db0b06528 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jeremydkaplan@gmail.com>
Date: Fri, 20 Nov 2015 23:03:15 -0500
Subject: [PATCH] Fix incorrectly global git merge config

---
 git/config | 2 --
 1 file changed, 2 deletions(-)

diff --git a/git/config b/git/config
index 5a2cdb9..7c8084a 100644
--- a/git/config
+++ b/git/config
@@ -7,7 +7,5 @@
 	default = simple
 [alias]
     lg = log --oneline --graph --decorate
-[merge]
-	ff = false
 [credential]
 	helper = cache