Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-D3.t @ 5673:ed7ff9c0a940
tests: update exit code in case of unresolved merge conflicts
CORE-TEST-OUTPUT-UPDATE: fa87536d3d70
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 02 Dec 2020 09:55:33 +0800 |
parents | a8ff17479fb8 |
children | f3e39a354378 |
comparison
equal
deleted
inserted
replaced
5672:12c53d7122a7 | 5673:ed7ff9c0a940 |
---|