equal
deleted
inserted
replaced
2587 node = opts.get('rev') |
2587 node = opts.get('rev') |
2588 |
2588 |
2589 t = opts.get('tool') |
2589 t = opts.get('tool') |
2590 if t: |
2590 if t: |
2591 if 'HGMERGE' in os.environ: |
2591 if 'HGMERGE' in os.environ: |
2592 os.environ['HGMERGE'] = t |
2592 os.environ['HGMERGE'] = '' |
2593 ui.setconfig('ui', 'merge', t) |
2593 ui.setconfig('ui', 'merge', t) |
2594 |
2594 |
2595 if not node: |
2595 if not node: |
2596 branch = repo.changectx(None).branch() |
2596 branch = repo.changectx(None).branch() |
2597 bheads = repo.branchheads(branch) |
2597 bheads = repo.branchheads(branch) |
2980 'use --all to remerge all files')) |
2980 'use --all to remerge all files')) |
2981 |
2981 |
2982 t = opts.get('tool') |
2982 t = opts.get('tool') |
2983 if t: |
2983 if t: |
2984 if 'HGMERGE' in os.environ: |
2984 if 'HGMERGE' in os.environ: |
2985 os.environ['HGMERGE'] = t |
2985 os.environ['HGMERGE'] = '' |
2986 ui.setconfig('ui', 'merge', t) |
2986 ui.setconfig('ui', 'merge', t) |
2987 |
2987 |
2988 ms = mergemod.mergestate(repo) |
2988 ms = mergemod.mergestate(repo) |
2989 m = cmdutil.match(repo, pats, opts) |
2989 m = cmdutil.match(repo, pats, opts) |
2990 ret = 0 |
2990 ret = 0 |