diff tests/test-conflict.t @ 29674:996cc60da32c

py3: update test-check-py3-compat.t output The lower part of test-check-py3-compat.t runs only on py3 and hence its remain unchanged. Hence this patch updates the output so that change in output in the next patches will be only related to the change in the patch.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 04 Aug 2016 00:04:48 +0530
parents c3e9269d9602
children 940c05b25b07
line wrap: on
line diff