From 0772e7d750532a91fc89c9bb131229a7fb989b91 Mon Sep 17 00:00:00 2001 From: Gubolin Date: Fri, 12 Sep 2014 19:54:58 +0200 Subject: support merging [WIP] --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 417778f..510117d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "vkBeautify"] path = vkBeautify url = https://github.com/vkiryukhin/vkBeautify +[submodule "diff-merge"] + path = diff-merge + url = https://github.com/nighca/diff-merge -- cgit v1.3.1