diff tests/test-hgweb-json.t @ 34558:f71c712ebdec

tests: add test for path conflicts during merge Differential Revision: https://phab.mercurial-scm.org/D787
author Mark Thomas <mbthomas@fb.com>
date Mon, 02 Oct 2017 14:05:30 -0700
parents 2b130e26c3a4
children b0262b25ab48
line wrap: on
line diff