Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 5371:17ed9b9a0d03
age | author | description |
---|---|---|
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 |
Sun, 12 Aug 2007 12:43:52 -0300 | Alexis S. L. Carvalho | merge with crew-stable |
Sun, 12 Aug 2007 12:15:10 -0300 | Alexis S. L. Carvalho | merge: fix a copy detection bug (issue672) |