changeset 33808 | 055fee3547df |
parent 33499 | 0407a51b9d8c |
child 34037 | 65ae54582713 |
--- a/mercurial/merge.py Thu Aug 10 21:00:30 2017 -0700 +++ b/mercurial/merge.py Fri Jul 14 19:27:28 2017 +0000 @@ -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")