log tests/test-merge5.out @ 5025:7041869a1bf6

age author description
Tue, 31 Oct 2006 13:02:49 +0100 Benoit Boissinot Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Sun, 29 Oct 2006 13:08:10 +0100 Benoit Boissinot allow update to switch to a different branch if the repo is clean
Wed, 09 Aug 2006 13:55:18 -0500 Matt Mackall Merge with crew, fix most tests