Mercurial > public > mercurial-scm > hg-stable
diff tests/test-resolve.t @ 21541:6062593d8b06
resolve: don't abort resolve -l even when no merge is in progress
This broke some internal automation that was quite reasonably checking for
unresolved files as a way to determine whether a merge happened cleanly. We
still abort for resolve --mark etc.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Fri, 23 May 2014 13:10:31 -0700 |
| parents | e4f451c8c05c |
| children | 6539c4e9c874 |
line wrap: on
line diff
--- a/tests/test-resolve.t Sun May 25 13:47:42 2014 +0200 +++ b/tests/test-resolve.t Fri May 23 13:10:31 2014 -0700 @@ -42,9 +42,12 @@ no more unresolved files $ hg commit -m 'resolved' -resolve -l should error since no merge in progress +resolve -l should be empty $ hg resolve -l + +resolve -m should abort since no merge in progress + $ hg resolve -m abort: resolve command not applicable when not merging [255]