diff tests/test-evolve-serveronly-legacy.t @ 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 79a926b557f1
children e1a230cc4527 e5d91fd1f319
line wrap: on
line diff