Mercurial > hg
comparison tests/test-rename-merge2.t @ 18543:c8ba98bf0e71
merge: don't indent "local changed %s which remote deleted" prompt
It was usually not shown in a context where indentation helped readability and
it was inconsistent with other prompts.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 04 Feb 2013 02:46:53 +0100 |
| parents | 5ed6a375e9ca |
| children | bcf29565d89f |
comparison
equal
deleted
inserted
replaced
| 18542:46be5c9dac91 | 18543:c8ba98bf0e71 |
|---|---|
| 615 -------------- | 615 -------------- |
| 616 searching for copies back to rev 1 | 616 searching for copies back to rev 1 |
| 617 resolving manifests | 617 resolving manifests |
| 618 overwrite: False, partial: False | 618 overwrite: False, partial: False |
| 619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a | 619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
| 620 local changed a which remote deleted | 620 local changed a which remote deleted |
| 621 use (c)hanged version or (d)elete? c | 621 use (c)hanged version or (d)elete? c |
| 622 a: prompt keep -> a | 622 a: prompt keep -> a |
| 623 b: versions differ -> m | 623 b: versions differ -> m |
| 624 preserving b for resolve of b | 624 preserving b for resolve of b |
| 625 rev: versions differ -> m | 625 rev: versions differ -> m |