Skip to content
Snippets Groups Projects
Commit 44c2e80d authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

rebase: fix dir/file conflict detection when using in-mem merge

Differential Revision: https://phab.mercurial-scm.org/D5360
parent e204d9a2
Branches
Tags
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment