Mercurial > hg
comparison tests/test-rename-merge2.t @ 27163:27b89a0957ec
filemerge: add a 'leave unresolved' option to change/delete prompts
We're going to make this option the default in an upcoming patch.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 30 Nov 2015 13:43:55 -0800 |
| parents | 296d55def9c4 |
| children | ad5966de3c9a |
comparison
equal
deleted
inserted
replaced
| 27162:4ab69be0ea15 | 27163:27b89a0957ec |
|---|---|
| 682 preserving b for resolve of b | 682 preserving b for resolve of b |
| 683 preserving rev for resolve of rev | 683 preserving rev for resolve of rev |
| 684 a: prompt deleted/changed -> m (premerge) | 684 a: prompt deleted/changed -> m (premerge) |
| 685 picked tool ':prompt' for a (binary False symlink False changedelete True) | 685 picked tool ':prompt' for a (binary False symlink False changedelete True) |
| 686 remote changed a which local deleted | 686 remote changed a which local deleted |
| 687 use (c)hanged version or leave (d)eleted? c | 687 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
| 688 b: both created -> m (premerge) | 688 b: both created -> m (premerge) |
| 689 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 689 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
| 690 merging b | 690 merging b |
| 691 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | 691 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
| 692 rev: versions differ -> m (premerge) | 692 rev: versions differ -> m (premerge) |
| 725 preserving b for resolve of b | 725 preserving b for resolve of b |
| 726 preserving rev for resolve of rev | 726 preserving rev for resolve of rev |
| 727 a: prompt changed/deleted -> m (premerge) | 727 a: prompt changed/deleted -> m (premerge) |
| 728 picked tool ':prompt' for a (binary False symlink False changedelete True) | 728 picked tool ':prompt' for a (binary False symlink False changedelete True) |
| 729 local changed a which remote deleted | 729 local changed a which remote deleted |
| 730 use (c)hanged version or (d)elete? c | 730 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
| 731 b: both created -> m (premerge) | 731 b: both created -> m (premerge) |
| 732 picked tool 'python ../merge' for b (binary False symlink False changedelete False) | 732 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
| 733 merging b | 733 merging b |
| 734 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | 734 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
| 735 rev: versions differ -> m (premerge) | 735 rev: versions differ -> m (premerge) |