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.