Mercurial > hg
changeset 21263:f3e37409ecd3
resolve: split test
Part of test-resolve.t is split into multiple tests to create an
injection point for new tests that will be added in subsequent patches.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Fri, 18 Apr 2014 18:26:42 -0700 |
| parents | edac098e6a55 |
| children | 4e932dc5c113 |
| files | tests/test-resolve.t |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-resolve.t Fri Apr 18 18:19:46 2014 -0700 +++ b/tests/test-resolve.t Fri Apr 18 18:26:42 2014 -0700 @@ -26,6 +26,13 @@ use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] +resolve -l should contain an unresolved entry + + $ hg resolve -l + U file + +resolve the failure + $ echo resolved > file $ hg resolve -m file $ hg commit -m 'resolved'