Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 5065:12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Add -n, --resolved, --unresolved to status.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 04 Aug 2007 12:26:48 -0700 |
parents | 2ef14e29e538 |
children | d316124ebbea |
comparison
equal
deleted
inserted
replaced
5064:420e1166a876 | 5065:12930b97a729 |
---|