equal
deleted
inserted
replaced
7663 |
7663 |
7664 See :hg:`help dates` for a list of formats valid for -d/--date. |
7664 See :hg:`help dates` for a list of formats valid for -d/--date. |
7665 |
7665 |
7666 Returns 0 on success, 1 if there are unresolved files. |
7666 Returns 0 on success, 1 if there are unresolved files. |
7667 """ |
7667 """ |
7668 cmdutil.check_at_most_one_arg(opts, b'clean', b'check', b'merge') |
7668 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge') |
7669 rev = opts.get('rev') |
7669 rev = opts.get('rev') |
7670 date = opts.get('date') |
7670 date = opts.get('date') |
7671 clean = opts.get('clean') |
7671 clean = opts.get('clean') |
7672 check = opts.get('check') |
7672 check = opts.get('check') |
7673 merge = opts.get('merge') |
7673 merge = opts.get('merge') |