D5410: merge: allow to merge non-conflicting changes outside narrowspec

[pulkit (Pulkit Goyal)]

pulkit added a subscriber: martinvonz.
pulkit added a comment.


  I am dubiuos that my fix is correct. I went through the history and didn't find any explanation why we don't allow merging non-conflicting changes outside narrowspec except TODO's. @martinvonz do you know why we don't allow merging of non-conflicting changes here?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5410

To: pulkit, durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel