Mercurial > hg
comparison tests/test-rename-merge2.t @ 39277:f785073f792c
merge: improve interactive one-changed one-deleted message (issue5550)
I like the wording from the bug, so I figured I'd package it up in a
change and see what people think.
Differential Revision: https://phab.mercurial-scm.org/D4336
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 20 Aug 2018 13:29:48 -0400 |
| parents | 41ef02ba329b |
| children | 975d959295ef |
comparison
equal
deleted
inserted
replaced
| 39276:337443f09fc8 | 39277:f785073f792c |
|---|---|
| 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 other [merge rev] changed a which local [working copy] deleted | 695 file a was deleted in other [merge rev] but was modified in local [working copy]. |
| 696 What do you want to do? | |
| 696 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 |
| 697 b: both created -> m (premerge) | 698 b: both created -> m (premerge) |
| 698 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) |
| 699 merging b | 700 merging b |
| 700 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | 701 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
| 735 preserving b for resolve of b | 736 preserving b for resolve of b |
| 736 preserving rev for resolve of rev | 737 preserving rev for resolve of rev |
| 737 starting 4 threads for background file closing (?) | 738 starting 4 threads for background file closing (?) |
| 738 a: prompt changed/deleted -> m (premerge) | 739 a: prompt changed/deleted -> m (premerge) |
| 739 picked tool ':prompt' for a (binary False symlink False changedelete True) | 740 picked tool ':prompt' for a (binary False symlink False changedelete True) |
| 740 local [working copy] changed a which other [merge rev] deleted | 741 file a was deleted in local [working copy] but was modified in other [merge rev]. |
| 742 What do you want to do? | |
| 741 use (c)hanged version, (d)elete, or leave (u)nresolved? u | 743 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
| 742 b: both created -> m (premerge) | 744 b: both created -> m (premerge) |
| 743 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) |
| 744 merging b | 746 merging b |
| 745 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | 747 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |