Mercurial > evolve
diff tests/test-evolve-content-divergent-basic.t @ 4893:d3ad50b40a4e
tests: add the new "-r" bit to the usual merge hint
CORE-TEST-OUTPUT-UPDATE: 8197b395710e
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 10 Oct 2019 08:22:41 +0700 |
parents | b6c819facbe8 |
children | ecf0f3bc7468 1f92a6aa40d6 |