Mercurial > hg
comparison tests/test-rename-merge2.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 | 7450f6500b6e |
comparison
equal
deleted
inserted
replaced
| 39284:975d959295ef | 39285:a3fd84f4fb38 |
|---|---|
| 690 preserving b for resolve of b | 690 preserving b for resolve of b |
| 691 preserving rev for resolve of rev | 691 preserving rev for resolve of rev |
| 692 starting 4 threads for background file closing (?) | 692 starting 4 threads for background file closing (?) |
| 693 a: prompt deleted/changed -> m (premerge) | 693 a: prompt deleted/changed -> m (premerge) |
| 694 picked tool ':prompt' for a (binary False symlink False changedelete True) | 694 picked tool ':prompt' for a (binary False symlink False changedelete True) |
| 695 file 'a' was deleted in other [merge rev] but was modified in local [working copy]. | 695 file 'a' was deleted in local [working copy] but was modified in other [merge rev]. |
| 696 What do you want to do? | 696 What do you want to do? |
| 697 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | 697 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
| 698 b: both created -> m (premerge) | 698 b: both created -> m (premerge) |
| 699 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 699 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 700 merging b | 700 merging b |
| 736 preserving b for resolve of b | 736 preserving b for resolve of b |
| 737 preserving rev for resolve of rev | 737 preserving rev for resolve of rev |
| 738 starting 4 threads for background file closing (?) | 738 starting 4 threads for background file closing (?) |
| 739 a: prompt changed/deleted -> m (premerge) | 739 a: prompt changed/deleted -> m (premerge) |
| 740 picked tool ':prompt' for a (binary False symlink False changedelete True) | 740 picked tool ':prompt' for a (binary False symlink False changedelete True) |
| 741 file 'a' was deleted in local [working copy] but was modified in other [merge rev]. | 741 file 'a' was deleted in other [merge rev] but was modified in local [working copy]. |
| 742 What do you want to do? | 742 What do you want to do? |
| 743 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 743 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 744 b: both created -> m (premerge) | 744 b: both created -> m (premerge) |
| 745 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | 745 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
| 746 merging b | 746 merging b |