tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mapping merge driver: continued (#2803)

Browse Source 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
20kdc
2021-02-06 22:56:40 +00:00
committed by GitHub
parent 5cbb3f1222
commit 2f01d7899f
14 changed files with 1026 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/mapping-merge-driver.sh Executable file
View File

@@ -0,0 +1,9 @@
#!/bin/sh
# Add this to .git/config:
# [merge "mapping-merge-driver"]
# name = Merge driver for maps
# driver = Tools/mapping-merge-driver.sh %A %O %B
dotnet run --project ./Content.Tools "$@"