Skip to content

Changes necessary for JDime wrapper script

Florian Heck requested to merge heckflor/GitWrapper:master into master

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

Merge request reports

Loading