Mercurial > hg
comparison mercurial/util.py @ 5241: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 | 335696e2a58f |
| children | 46c5e1ee8aaa |
comparison
equal
deleted
inserted
replaced
| 5240:85ba6ab5bd3a | 5241:3786ef8877d5 |
|---|