cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the .gitconfig, or doesn't

Browse Source
This commit is contained in:
Anewbe
2017-12-01 20:19:17 -06:00
parent b4dfdb8aec
commit 1c025466f8
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitconfig
View File

@@ -2,9 +2,3 @@
name = mapmerge driver name = mapmerge driver
driver = ./mapmerge.sh %O %A %B driver = ./mapmerge.sh %O %A %B
recursive = text recursive = text
[merge "merge-dmi"]
name = iconfile merge driver
driver = ./tools/dmitool/dmimerge.sh %O %A %B
[merge "merge-dmm"]
name = mapmerge driver
driver = ./tools/mapmerge/mapmerge.sh %O %A %B