Mercurial > hg
comparison tests/test-merge9.t @ 26352:e635bc9bb7d9
resolve: consistently describe re-merge + unresolved
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 25 Sep 2015 03:51:46 -0400 |
| parents | 9209c02f1f25 |
| children | ef1eb6df7071 |
comparison
equal
deleted
inserted
replaced
| 26351:8c7d8d5e1e0f | 26352:e635bc9bb7d9 |
|---|---|
| 75 R baz | 75 R baz |
| 76 | 76 |
| 77 resolve all warning | 77 resolve all warning |
| 78 $ hg resolve | 78 $ hg resolve |
| 79 abort: no files or directories specified | 79 abort: no files or directories specified |
| 80 (use --all to remerge all files) | 80 (use --all to re-merge all unresolved files) |
| 81 [255] | 81 [255] |
| 82 | 82 |
| 83 resolve all | 83 resolve all |
| 84 $ hg resolve -a | 84 $ hg resolve -a |
| 85 merging bar | 85 merging bar |