diff .hgignore @ 3898:93d9cde93b82 stable

tests: add test for issue5946 The test case is a copy of the one for 5833. The only difference is that the merge parents are recorded in the opposite order (and that the test is truncated because it fails).
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 25 Jul 2018 14:00:49 -0700
parents aad37ffd7d58
children ba316ce15040
line wrap: on
line diff