Mercurial > hg

diff contrib/editmerge @ 39526:c6eb2118f44f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: show that merging with sparse is broken when rename is involved This patch adds test to show that merging with sparse is broken when you have a rename on one side and just modification on another side. Differential Revision: https://phab.mercurial-scm.org/D4340
author Pulkit Goyal <pulkit@yandex-team.ru>
date Tue, 21 Aug 2018 15:09:22 +0300
parents 612502900a2d
children
line wrap: on
line diff