Mercurial > hg-stable
diff tests/test-confused-revert.t @ 14903:a934b9249574 stable
revert: restore check for uncommitted merge (issue2915) (BC)
This will restore the pre-1.9 behavior.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 21 Jul 2011 15:39:37 -0500 |
| parents | 4fcde634f5e0 |
| children | fc1d75e7a98d |
line wrap: on
line diff
--- a/tests/test-confused-revert.t Tue Jul 19 13:43:53 2011 -0500 +++ b/tests/test-confused-revert.t Thu Jul 21 15:39:37 2011 -0500 @@ -59,8 +59,8 @@ Revert should fail: $ hg revert - abort: no files or directories specified - (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge) + abort: uncommitted merge with no revision specified + (use "hg update" or see "hg help revert") [255] Revert should be ok now: