tests/test-addremove.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Jul 2006 19:28:31 +0200
changeset 2552 bb403d427974
parent 2182 4e35843b2683
child 2955 9d1c3529ebbc
permissions -rw-r--r--
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)

(the addremove command is deprecated; use add and remove --after instead)
adding dir/bar
adding foo
dir/bar
foo
(the addremove command is deprecated; use add and remove --after instead)
adding dir/bar_2
adding foo_2
dir/bar_2
foo_2