Submitter | Gregory Szorc |
---|---|
Date | May 9, 2014, 1:46 a.m. |
Message ID | <6d5b402aae2d697b93b1.1399599981@vm-ubuntu-main.gateway.sonic.net> |
Download | mbox | patch |
Permalink | /patch/4693/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/tests/test-resolve.t b/tests/test-resolve.t --- a/tests/test-resolve.t +++ b/tests/test-resolve.t @@ -25,8 +25,15 @@ failing merge 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 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'