Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 5483:0c43f87baba3 default tip
age | author | description |
---|---|---|
Tue, 09 Oct 2007 17:25:24 -0500 | Matt Mackall | Merge with -stable |
Mon, 08 Oct 2007 18:47:22 -0500 | Matt Mackall | findcopies: fix rename bug |
Mon, 08 Oct 2007 18:47:22 -0500 | Matt Mackall | findcopies: fix rename bug |
Wed, 03 Oct 2007 23:09:36 +0200 | Patrick Mezard | merge: provide *_ISLINK environment vars to merge helper |
Thu, 04 Oct 2007 19:44:37 -0500 | Matt Mackall | merge: add debug diagnostics for findcopies |
Thu, 23 Aug 2007 01:48:29 -0300 | Alexis S. L. Carvalho | merge: forcefully mark files that we get from the second parent as dirty |