Mercurial > hg
diff tests/test-merge9.out @ 7527:5a14a8f3b909
resolve: require -a switch to resolve all files
Like revert -a, this should make this command slightly safer
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 19 Dec 2008 16:47:36 -0600 |
| parents | 92ccccb55ba3 |
| children | 9fe7e6acf525 |
line wrap: on
line diff
--- a/tests/test-merge9.out Fri Dec 19 21:38:01 2008 +0100 +++ b/tests/test-merge9.out Fri Dec 19 16:47:36 2008 -0600 @@ -28,6 +28,8 @@ % after U bar R baz +% resolve all warning +abort: no files or directories specified; use --all to remerge all files % resolve all merging bar warning: conflicts during merge.