log mercurial/merge.py @ 3401:a004164dbeef

age author description
Fri, 13 Oct 2006 17:58:04 -0500 Matt Mackall merge: update dirstate correctly for non-branchmerge updates