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

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  In https://phab.mercurial-scm.org/D6369#93709, @yuja wrote:
  
  > Test failures:
  
  
  Thanks for letting me know. I've installed bzr now and I've fixed the test cases (the `files:` field in the output was from `file_mods`).

REPOSITORY
  rHG Mercurial

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

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