Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/dirstate.py @ 4410:bbc97d419b16
Add fast-forward branch merging
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sun, 06 May 2007 20:27:45 -0700 |
parents | 109077e7048d |
children | 30e7aa755efd |