equal
deleted
inserted
replaced
4992 if (show and (mark or unmark)) or (mark and unmark): |
4992 if (show and (mark or unmark)) or (mark and unmark): |
4993 raise util.Abort(_("too many options specified")) |
4993 raise util.Abort(_("too many options specified")) |
4994 if pats and all: |
4994 if pats and all: |
4995 raise util.Abort(_("can't specify --all and patterns")) |
4995 raise util.Abort(_("can't specify --all and patterns")) |
4996 if not (all or pats or show or mark or unmark): |
4996 if not (all or pats or show or mark or unmark): |
4997 raise util.Abort(_('no files or directories specified; ' |
4997 raise util.Abort(_('no files or directories specified'), |
4998 'use --all to remerge all files')) |
4998 hint=('use --all to remerge all files')) |
4999 |
4999 |
5000 wlock = repo.wlock() |
5000 wlock = repo.wlock() |
5001 try: |
5001 try: |
5002 ms = mergemod.mergestate(repo) |
5002 ms = mergemod.mergestate(repo) |
5003 |
5003 |