comparison tests/test-import.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 9f42f819267b
children 995ed7aac8a6
comparison
equal deleted inserted replaced
3429:6096acdc7d37 3430:14fbb847be5a