branch | stable |
changeset 4166 | 7091f7215651 |
parent 4165 | ccbfbeee6cf3 |
child 4168 | 8eec9422bd8e |
--- a/tests/test-evolve.t Fri Oct 12 14:55:46 2018 +0200 +++ b/tests/test-evolve.t Fri Oct 12 14:56:00 2018 +0200 @@ -380,8 +380,8 @@ $ hg up -r "desc('a nifty feature')" 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg revert -r "desc('another feature')" --all + adding file-from-B reverting main-file-1 - adding file-from-B $ sed -i'' -e s/Zwei/deux/ main-file-1 $ hg commit -m 'another feature that rox' -o 5 created new head