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

..

src

Move conflict computation to merge command

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

package.json

fix plugin frontend build

2019-10-21 14:52:08 +02:00

pom.xml

POC

2019-10-17 09:23:37 +02:00

tsconfig.json

added shared tsconfig package

2019-10-21 14:10:48 +02:00