Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
7526:b7d4db95e95a | 7527:5a14a8f3b909 |
---|---|
26 % re-resolve baz | 26 % re-resolve baz |
27 merging baz and foo to baz | 27 merging baz and foo to baz |
28 % after | 28 % after |
29 U bar | 29 U bar |
30 R baz | 30 R baz |
31 % resolve all warning | |
32 abort: no files or directories specified; use --all to remerge all files | |
31 % resolve all | 33 % resolve all |
32 merging bar | 34 merging bar |
33 warning: conflicts during merge. | 35 warning: conflicts during merge. |
34 merging bar failed! | 36 merging bar failed! |
35 % after | 37 % after |