Mercurial > hg
comparison hgext/fetch.py @ 42977:699102b10530
histedit: sniff-test for untracked file conflicts before prompting for rules
This bug is as old as histedit, which is more than 10 years! I'm a
little sad about the extra calculations here that we're just going to
throw out, but I don't see any better way to look for untracked file
conflicts and I want the bug fixed.
Differential Revision: https://phab.mercurial-scm.org/D6882
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 25 Sep 2019 13:50:48 -0400 |
parents | 5cb8158a61f7 |
children | 2372284d9457 |
comparison
equal
deleted
inserted
replaced
42976:f200bea8470b | 42977:699102b10530 |
---|