Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 5059:8d9bdcbb2b18
age | author | description |
---|---|---|
Thu, 02 Aug 2007 12:29:10 -0500 | Matt Mackall | merge: avoid double deletion mentioned in issue636 |
Wed, 01 Aug 2007 14:03:48 -0500 | Matt Mackall | Merge with stable |
Wed, 01 Aug 2007 12:33:12 -0500 | Matt Mackall | merge: do early copy to deal with issue636 |
Thu, 26 Jul 2007 12:02:55 -0500 | Matt Mackall | Merge with -stable |
Thu, 26 Jul 2007 11:19:53 -0500 | Matt Mackall | merge: don't forget to update the dirstate for exec bit changes |
Sat, 21 Jul 2007 16:02:10 -0500 | Matt Mackall | Make repo locks recursive, eliminate all passing of lock/wlock |