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
Thu, 12 Oct 2006 14:49:19 -0500 Matt Mackall merge: turn followcopies on by default
Tue, 10 Oct 2006 03:39:44 -0500 Matt Mackall merge: pull user messages out to hg.py