Changes necessary for JDime wrapper script

To retrieve the information about the number of conflicts, a merge now returns the number of conflicted files instead of a Status object.

added 6 commits

• 1fa8aef0...e3d5ec6d - 5 commits from branch seibt:master
• cc5631d7 - Merge branch 'master' of gitlab.infosun.fim.uni-passau.de:seibt/GitWrapper

Compare with previous version

merged