diff options
| author | Gubolin <gubolin@fantasymail.de> | 2014-09-12 19:54:58 +0200 |
|---|---|---|
| committer | Gubolin <gubolin@fantasymail.de> | 2014-09-12 19:54:58 +0200 |
| commit | 0772e7d750532a91fc89c9bb131229a7fb989b91 (patch) | |
| tree | 0169c343a399cb2d3d7faa84518d798fe4b50f16 /.gitmodules | |
| parent | 39a50e190ac39560564507399d26fe7c141de86f (diff) | |
| download | snap-0772e7d750532a91fc89c9bb131229a7fb989b91.tar.gz snap-0772e7d750532a91fc89c9bb131229a7fb989b91.zip | |
support merging [WIP]
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
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 |