From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Wed, 23 Oct 2019 14:28:09 +0000 (+0300)
Subject: Filter conflicting changes (deleted + added at the same time)
X-Git-Tag: v1.43.0~176
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=b32696a059ab6f9e01e16df26f1cdf0d8fbf1e91;hp=b32696a059ab6f9e01e16df26f1cdf0d8fbf1e91;p=simantics%2F3d.git

Filter conflicting changes (deleted + added at the same time)

gitlab #35


Change-Id: I90278469f0052b367b326a2ff495ae00c20aa12b
---