comparison contrib/simplemerge @ 47581:28a914b3d4ce

test-bookmark: clarify the path involved in a pull creating divergence This make the test easier to follow. Especially because this part is currently failing on windows. Differential Revision: https://phab.mercurial-scm.org/D11056
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 10 Jul 2021 02:42:09 +0200
parents c102b704edb5
children c91418480cb0
comparison
equal deleted inserted replaced
47580:5f836c10ed3d 47581:28a914b3d4ce