Mercurial > hg

diff tests/test-merge-commit.t @ 42192:818051048c2e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: show IMM is broken when merging file empty in destination When we are doing in-memory merging, and we are merging a file which is empty in merge destination, it leads to error 'abort: xxx not found in manifest'. Next patch will fix this error. Differential Revision: https://phab.mercurial-scm.org/D6307
author Pulkit Goyal <pulkit@yandex-team.ru>
date Wed, 24 Apr 2019 19:28:46 +0300
parents d4e62df1c73d
children 91a0bc50b288
line wrap: on
line diff