Files
vgstation13/.gitconfig
DrCelt d0d5d4e94f Ports DMItool from bay (#12784)
* Ports DMItool from bay
Coded by GigaNinja32
He's a pretty cool dude and allowed me to blame the bugs in it on him
As far as I can tell there are none
How does it work? I don't know
I do know that it resolves DMI conflicts
if you ever have coded anything with a DMI you'll know that that is literally revolutionary
Why hasn't anyone ported this before it's not even dm code I literally just ctrl+v'd  the folder and slapped it in

* does thing

* okay done
2016-12-22 23:00:31 +01:00

8 lines
210 B
INI

[merge "merge-dmm"]
name = mapmerge driver
driver = ./maptools/mapmerge.sh %O %A %B
recursive = text
[merge "merge-dmi"]
name = iconfile merge driver
driver = ./tools/dmitool/dmimerge.sh %O %A %B