branch | stable |
changeset 23413 | 0c432696dae3 |
parent 15615 | 41885892796e |
child 26420 | 2fc86d92c4a9 |
--- a/tests/test-issue619.t Fri Nov 28 02:57:33 2014 +0100 +++ b/tests/test-issue619.t Mon Dec 01 05:18:12 2014 -0800 @@ -28,3 +28,9 @@ abort: merging with a working directory ancestor has no effect [255] +Even with strange revset (issue4465) + + $ hg merge ::. + abort: merging with a working directory ancestor has no effect + [255] +