Mercurial > hg
comparison tests/test-merge-revert2.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 | ce3a133f71b3 |
children | 55c6ebd11cb9 |
comparison
equal
deleted
inserted
replaced
34557:3b9428f4403d | 34558:f71c712ebdec |
---|