Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 4404:47371e1c1db4
age | author | description |
---|---|---|
Thu, 03 May 2007 17:27:21 -0500 | Matt Mackall | Merge with stable |
Thu, 03 May 2007 17:24:43 -0500 | Matt Mackall | merge: reorganize some hunks in findcopies |
Thu, 03 May 2007 17:24:43 -0500 | Matt Mackall | merge: simplify a check in checkcopies |
Thu, 03 May 2007 17:24:43 -0500 | Matt Mackall | merge: expand and simplify the invalid handling for directory moves |
Thu, 03 May 2007 17:24:43 -0500 | Matt Mackall | merge: fix a bug detecting directory moves |
Thu, 03 May 2007 17:24:43 -0500 | Matt Mackall | merge: clarify the findcopies code |
Mon, 16 Apr 2007 12:37:30 -0500 | Matt Mackall | Merge with stable |