D6369: templatekw: make {file_*} compare to both merge parents (issue4292)

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  Yuya, are you okay with this patch? My other patches don't depend on it, so I don't care much from that perspective, but it really feels like a bug fix to me.

REPOSITORY
  rHG Mercurial

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

To: martinvonz, #hg-reviewers
Cc: yuja, mercurial-devel