Mercurial > hg
diff tests/test-rename-merge2.out @ 7320:8dca507e56ce
ui: log non-interactive default response to stdout when verbose
This allows test scripts that feed their output into documentation
to properly show the session as it would appear to an end-user.
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Fri, 07 Nov 2008 10:27:39 +0100 |
parents | 368a4ec603cc |
children | 5bf5fd1e2a74 |
line wrap: on
line diff
--- a/tests/test-rename-merge2.out Thu Nov 06 11:17:38 2008 +0100 +++ b/tests/test-rename-merge2.out Fri Nov 07 10:27:39 2008 +0100 @@ -455,6 +455,8 @@ searching for copies back to rev 1 b: versions differ -> m rev: versions differ -> m +remote changed a which local deleted +use (c)hanged version or leave (d)eleted? c a: prompt recreating -> g preserving b for resolve of b preserving rev for resolve of rev @@ -480,6 +482,8 @@ overwrite None partial False ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b searching for copies back to rev 1 + local changed a which remote deleted +use (c)hanged version or (d)elete? c b: versions differ -> m rev: versions differ -> m preserving b for resolve of b