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

..

api/v2/resources

Fix unit test

2019-03-11 16:00:16 +01:00

protocolcommand/git

Introduce abstraction for repository location

2019-05-09 14:08:18 +02:00

repository

Move conflict computation to merge command

2019-11-11 13:06:07 +01:00

web

Add unit test

2019-10-21 11:11:44 +02:00