log mercurial/merge.py @ 4209:dbc3846c09a1

age author description
Wed, 14 Mar 2007 01:26:09 -0500 Matt Mackall Merge with -stable, fix small test failure
Tue, 13 Mar 2007 18:50:02 -0500 Matt Mackall Move branch read/write to dirstate where it belongs
Sat, 10 Mar 2007 17:45:32 -0800 Brendan Cully Merge with crew-stable
Tue, 27 Feb 2007 16:47:16 -0600 Matt Mackall Merge with stable
Tue, 27 Feb 2007 16:20:06 -0600 Matt Mackall merge: fix renaming of subdirectories under renamed directories
Fri, 29 Dec 2006 20:04:31 -0600 Matt Mackall symlinks: minimal support for symlinks in merge/update
Fri, 29 Dec 2006 20:04:31 -0600 Matt Mackall symlinks: add flags param to wwrite
Fri, 29 Dec 2006 20:04:31 -0600 Matt Mackall replace filehandle version of wwrite with wwritedata
Thu, 14 Dec 2006 20:25:19 -0600 Matt Mackall Simplify i18n imports
Wed, 13 Dec 2006 13:27:09 -0600 Matt Mackall Replace demandload with new demandimport
Tue, 12 Dec 2006 18:16:23 -0600 Matt Mackall Remove deprecated old-style branch support
Tue, 12 Dec 2006 17:52:33 -0600 Matt Mackall Fix copy detection corner case
Sun, 10 Dec 2006 20:35:28 -0200 Alexis S. L. Carvalho Use UTF-8 in .hg/branch
Mon, 04 Dec 2006 17:10:31 -0600 Matt Mackall imported patch collision
Sun, 03 Dec 2006 16:16:33 -0600 Matt Mackall Handle transcoding of branch names