tests/test-addremove.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 15 Aug 2006 11:38:07 -0700
changeset 2903 013921c753bd
parent 2182 4e35843b2683
child 2955 9d1c3529ebbc
permissions -rw-r--r--
merge with other head by default, not tip. fixes issue 339.

(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