Mercurial > hg-stable

diff tests/test-rename-merge2.t @ 18543:c8ba98bf0e71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/tests/test-rename-merge2.t	Mon Feb 04 02:46:38 2013 +0100
+++ b/tests/test-rename-merge2.t	Mon Feb 04 02:46:53 2013 +0100
@@ -617,7 +617,7 @@
   resolving manifests
    overwrite: False, partial: False
    ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
-   local changed a which remote deleted
+  local changed a which remote deleted
   use (c)hanged version or (d)elete? c
    a: prompt keep -> a
    b: versions differ -> m