Mercurial > hg

diff hgdemandimport/demandimportpy3.py @ 44342:7f7c8521e9bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add test of rebase with conflict in merge commit It doesn't seem like we had any tests of this. I think it's pretty weird that the two parents we're merging are not the working copy parents during the conflict resolution. Differential Revision: https://phab.mercurial-scm.org/D7824
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 10 Jan 2020 17:46:10 -0800
parents f81c17ec303c
children a6e12d477595
line wrap: on
line diff