Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 2825:1ea086bc2086
age | author | description |
---|---|---|
Tue, 08 Aug 2006 09:11:16 -0500 | Matt Mackall | Merge: combine choose and moddirstate to partial |
Mon, 07 Aug 2006 23:53:04 -0500 | Matt Mackall | Rename merge.allow -> merge.branchmerge |
Mon, 07 Aug 2006 16:47:06 -0500 | Matt Mackall | Merge with crew |