Merge pull request #37976 from AutomaticFrenzy/patch/dmi-merger

Add a Python script to fix DMI conflicts
2018-05-25 10:55:33 -05:00
parent cc088d9113
commit e37a9a36ed
8 changed files with 446 additions and 9 deletions
@@ -10,5 +10,7 @@ for %%f in (*.merge) do (

 	driver = tools/hooks/%%f %%P %%O %%A %%B %%L >> ..\..\.git\config
 )
+echo Installing Python dependencies
+python -m pip install -r ..\mapmerge2\requirements.txt
 echo Done
 pause