Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 4410:bbc97d419b16
age | author | description |
---|---|---|
Sun, 06 May 2007 20:27:45 -0700 | Brendan Cully | Add fast-forward branch merging |
Thu, 03 May 2007 17:27:21 -0500 | Matt Mackall | Merge with stable |