Mercurial > hg > mercurial-crew-with-dirclash
comparison setup.py @ 5223:3786ef8877d5
imerge: add automerge flag to attempt to batch merge all conflicts
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 23 Aug 2007 22:45:41 -0700 |
parents | 55860a45bbf2 |
children | 5105b119edd2 |
comparison
equal
deleted
inserted
replaced
5222:85ba6ab5bd3a | 5223:3786ef8877d5 |
---|