Mercurial > evolve

diff tests/test-push-checkheads-unpushed-D2.t @ 3430:14fbb847be5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: update output for new `merge --abort` message Core have updated its command to cancel a failed merge, update the test output to match it. CORE-TEST-OUTPUT-UPDATE: 41ef02ba329b
author Boris Feld <boris.feld@octobus.net>
date Fri, 19 Jan 2018 19:18:05 +0100
parents 8feb2cae7eae
children ccfcacc5ee7c 2e703ed1c713
line wrap: on
line diff