log mercurial/merge.py @ 13322:c19b9282d3a7 stable

age author description
Mon, 31 Jan 2011 13:33:41 +0100 Erik Zielke subrepo: make update -C clean the working directory for svn subrepos stable