Mercurial > hg > mercurial-crew-with-dirclash
diff .hgignore @ 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 | e6cc4d4f5a81 |
children |