changeset 22022 | 2ea6d906cf9b |
parent 22021 | e9801c7b6ff0 |
child 22023 | f18830651811 |
--- a/mercurial/filemerge.py Mon Jun 09 23:37:36 2014 -0700 +++ b/mercurial/filemerge.py Tue Jul 29 11:55:01 2014 -0700 @@ -191,7 +191,8 @@ (tool, premerge, _valid)) if premerge: - r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels) + r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels, + no_minimal=True) if not r: ui.debug(" premerge successful\n") return 0