Mercurial > hg > mercurial-crew-with-dirclash
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 |