diff .hgsigs @ 40803:44c2e80db985 stable

rebase: fix dir/file conflict detection when using in-mem merge Differential Revision: https://phab.mercurial-scm.org/D5360
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 03 Dec 2018 11:14:44 -0800
parents 5eaa5eb0db4e
children 47719d7c581f
line wrap: on
line diff