From c7b6993f7afba7797f22fbb86700fc085cde5638 Mon Sep 17 00:00:00 2001
From: Exxion <exxion191@yahoo.com>
Date: Mon, 16 Feb 2015 21:50:34 -0500
Subject: [PATCH] Fix path to mapmerge tool

It looks like people use this, but manually edit the config file to do
so because nobody has updated this path in two years or more.
---
 .gitconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index de5ff6f2542..817e9dc6a58 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,4 @@
 [merge "merge-dmm"]
     name = mapmerge driver
-    driver = ./mapmerge.sh %O %A %B
+    driver = ./maptools/mapmerge.sh %O %A %B
     recursive = text
-