changeset 45831 | 976b26bdd0d8 |
parent 43879 | 8caec25f5d8f |
child 46140 | 3ca5ca380a34 |
--- a/tests/test-merge-tools.t Tue Oct 06 13:34:51 2020 +0200 +++ b/tests/test-merge-tools.t Thu Oct 29 13:54:25 2020 +0100 @@ -1868,6 +1868,7 @@ $ hg update -q -C 1 $ hg mv f f.txt $ hg ci -qm "f.txt" + warning: commit already existed in the repository! $ hg update -q -C 2 $ hg merge -y -r tip --tool echo \ > --config merge-tools.echo.args='$base $local $other $output' \