Mercurial > evolve
diff hgext3rd/topic/__init__.py @ 3430:14fbb847be5a
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 | e21b4f3b32c1 |
children | b0ca70e733bf |