Mercurial > hg
comparison tests/test-obsmarkers-effectflag.t @ 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 | cc977ec0b8b9 |
| children | f90a5c211251 |
comparison
equal
deleted
inserted
replaced
| 39284:975d959295ef | 39285:a3fd84f4fb38 |
|---|