changeset 30162 | 5cb830801855 |
parent 30161 | 339f9d93daa6 |
child 30172 | 90a6c18a7c1d |
--- a/mercurial/merge.py Wed Oct 12 12:22:18 2016 +0200 +++ b/mercurial/merge.py Wed Oct 12 12:22:18 2016 +0200 @@ -478,7 +478,9 @@ if fca.node() == nullid and flags != flo: if preresolve: self._repo.ui.warn( - _('warning: cannot merge flags for %s\n') % afile) + _('warning: cannot merge flags for %s ' + 'without common ancestor - keeping local flags\n') + % afile) elif flags == fla: flags = flo if preresolve: