Mercurial > hg
annotate tests/bundles/issue4438-r1.hg @ 39285:a3fd84f4fb38
filemerge: fix the wrong placements of messages in prompt
Mistakenly, the local-changed-other-deleted-message was put in
other-change-local-deleted and vice versa. This followups on D4336.
Thanks to Yuya who spotted this.
Differential Revision: https://phab.mercurial-scm.org/D4375
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Sun, 26 Aug 2018 19:14:26 +0300 |
parents | c1f370dab456 |
children |
rev | line source |
---|---|
23233
c1f370dab456
discovery: test coverage for issue4438 / 86c35b7ae300 / 73cfaa348650
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
1 (binary:application/octet-stream) |