Submitter | phabricator |
---|---|
Date | Aug. 15, 2017, 5:51 p.m. |
Message ID | <89a57bb5c403f420d00331b3c9df883a@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/23034/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -753,7 +753,7 @@ # check case-folding collision in provisional merged manifest foldmap = {} - for f in sorted(pmmf): + for f in pmmf: fold = util.normcase(f) if fold in foldmap: raise error.Abort(_("case-folding collision between %s and %s")