Mercurial > hg
diff tests/test-copy-move-merge.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 | 975d959295ef |
children | 91a0bc50b288 |
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t Sat Aug 25 21:17:34 2018 +0300 +++ b/tests/test-copy-move-merge.t Sun Aug 26 19:14:26 2018 +0300 @@ -88,7 +88,7 @@ > c > EOF rebasing 2:add3f11052fa "other" (tip) - file 'a' was deleted in other [source] but was modified in local [dest]. + file 'a' was deleted in local [dest] but was modified in other [source]. What do you want to do? use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c