diff .editorconfig @ 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 d30fdd6d1bf7
children 1d6066336d7b
line wrap: on
line diff