Mercurial > evolve
comparison setup.cfg @ 4472:5dbaabfe2c59
test: fix a phase divergence test case to actually not contains conflict
The previous test case had a conflict, but that conflict is currently not raise
by phase divergence resolution. This is an independent bug to solve.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 29 Mar 2019 15:15:07 +0100 |
parents | b81d3775006b |
children |
comparison
equal
deleted
inserted
replaced
4471:3caa4a459439 | 4472:5dbaabfe2c59 |
---|