Merge changes

This commit is contained in:
Dennis Eichhorn 2017-11-06 18:36:39 +01:00
parent 27cf67ba2c
commit 63efc54396

3
Helper/merge.sh Normal file
View File

@ -0,0 +1,3 @@
#!/bin/bash
git merge -s subtree --no-commit Developer-Guide/master --allow-unrelated-histories