Subject: bug#33129: Acknowledgement (26.1; `vc-hg-find-file-hook' can never detect files with conflicts)

From: Daniel Pittman <[email-masked]>
Date: Tue, 23 Oct 2018 12:10:35 -0400

Please find attached a patch fixing both the issues identified in this bug: