Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 28020:cffa46cbdb8f
merge: tell _checkunknownfiles about whether this was merge --force
In an upcoming patch we'll have different behavior here for when 'merge
--force' is used as opposed to when other kinds of force operations are
performed, like rebases.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 01 Feb 2016 20:28:32 -0800 |
| parents | eb22def9db3b |
| children | 72072cfc7e91 |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Feb 01 20:28:32 2016 -0800 +++ b/mercurial/commands.py Mon Feb 01 20:28:32 2016 -0800 @@ -5242,7 +5242,8 @@ try: # ui.forcemerge is an internal variable, do not document repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') - return hg.merge(repo, node, force=opts.get('force')) + force = opts.get('force') + return hg.merge(repo, node, force=force, mergeforce=force) finally: ui.setconfig('ui', 'forcemerge', '', 'merge')