Mercurial > evolve
comparison contrib/merge-test-compat.sh @ 4711:88c8ef4d703c
tests: update output for shorted prompts from Mercurial
This makes tests pass again after Mercurial commits 4764e8436b2a
(filemerge: make last line of prompts <40 english chars (issue6158),
2019-06-20)
CORE-TEST-OUTPUT-UPDATE: 4764e8436b2a
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Jul 2019 10:07:39 +0200 |
| parents | 13a4c35f7a0b |
| children | 6db9e2350948 |
comparison
equal
deleted
inserted
replaced
| 4710:0e0731406efd | 4711:88c8ef4d703c |
|---|