Files
SCM-Manager/scm-plugins
Rene Pfeuffer 913e5289e6 Move conflict computation to merge command
Therefore revert changes to diff command and introduce new
MergeConflictResult instead of streaming result.
2019-11-11 13:06:07 +01:00
..

Plugins moved see https://bitbucket.org/sdorra/scm-manager/wiki/scm-plugins for details.