tests/test-merge5.out
author Sune Foldager <cryo@cyanite.org>
Mon, 11 May 2009 07:55:13 +0200
changeset 8344 873429914ec5
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
url: fix bug in passwordmgr related to auth configuration Usernames given as part of the URL would be ignored. This bug was introduced in 89c80c3dc5842d609e9ba13f08fd2cf7f127c25a

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')