diff tests/test-push-checkheads-pruned-B1.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 21f06d932231
children 2280461343e5 62b60fc1983d
line wrap: on
line diff