diff tests/test-evolve-content-divergent-user-independent-resolution.t @ 6491:173293415d1f

tests: capture .hg/merge/state presence as well
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 25 May 2023 11:08:09 -0300
parents 5e14782908e4
children bd2c42680dff
line wrap: on
line diff