Mercurial > public > mercurial-scm > hg
diff tests/test-merge-types.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 | 4b0c9c674707 |
| children | af5f099d932b |
line wrap: on
line diff
--- a/tests/test-merge-types.out Thu Nov 06 11:17:38 2008 +0100 +++ b/tests/test-merge-types.out Fri Nov 07 10:27:39 2008 +0100 @@ -5,6 +5,8 @@ overwrite None partial False ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c searching for copies back to rev 1 + conflicting flags for a +(n)one, e(x)ec or sym(l)ink? n a: update permissions -> e 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -15,6 +17,8 @@ overwrite None partial False ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f searching for copies back to rev 1 + conflicting flags for a +(n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g getting a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved