log mercurial/merge.py @ 3593:9bfb3c049b2a

age author description
Tue, 31 Oct 2006 13:03:23 +0100 Benoit Boissinot merge with backout
Tue, 31 Oct 2006 13:02:49 +0100 Benoit Boissinot Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Sun, 29 Oct 2006 14:18:55 +0100 Benoit Boissinot use workingcontext.files() to detect if the repo is unclean