Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 2811:4f7abf341cd4
age | author | description |
---|---|---|
Mon, 07 Aug 2006 16:47:06 -0500 | Matt Mackall | Merge with crew |
Thu, 03 Aug 2006 15:24:41 -0500 | Matt Mackall | Move merge code to its own module |