Commit 085d5bcf0b7635235aeaa2608540072bdc88ae99

Stefan Sperling 2019-03-27T12:03:38

use a better naming scheme for tree conflict tests