branch | stable |
changeset 30229 | 69ffbbe73dd0 |
parent 30200 | a2804ddcf9ae |
child 32698 | 1b5c61d38a52 |
--- a/tests/test-up-local-change.t Wed Oct 19 18:06:14 2016 +0200 +++ b/tests/test-up-local-change.t Tue Oct 25 21:01:53 2016 +0200 @@ -242,4 +242,11 @@ -a +b +test for superfluous filemerge of clean files renamed in the past + + $ hg up -qC tip + $ echo c > c + $ hg add c + $ hg up -qt:fail 0 + $ cd ..