log tests/test-up-local-change.out @ 3580:41989e55fa37

age author description
Sun, 29 Oct 2006 13:08:10 +0100 Benoit Boissinot allow update to switch to a different branch if the repo is clean
Sun, 15 Oct 2006 16:18:09 -0500 Matt Mackall merge: if filemerge skips merge, report as updated