# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2018-08-20 15:29:43
# Node ID 0998f843fcb9a8291201fec5b9838c1b6c1f59a2
# Parent  f85b256082527ab729cd480c21a310127b42eb2e

py3: whitelist another test caught by the ratchet

Differential Revision: https://phab.mercurial-scm.org/D4335

diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -285,6 +285,7 @@ test-merge-force.t
 test-merge-halt.t
 test-merge-internal-tools-pattern.t
 test-merge-local.t
+test-merge-no-file-change.t
 test-merge-remove.t
 test-merge-revert.t
 test-merge-revert2.t