Mercurial > hg
comparison mercurial/windows.py @ 18539:cf25e4efd685
merge: delay prompts a bit and show them in (extra) sorted order
Preparing for backout of 760c0d67ce5e.
The number of prompts will for all relevant cases be significantly smaller than
the total number of files in the manifests. We can thus afford to sort the
prompts more than we can afford to sort the manifests.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 24 Jan 2013 23:57:44 +0100 |
| parents | 242d2f4ec01c |
| children | cafa447a7d3b |
comparison
equal
deleted
inserted
replaced
| 18538:94317c2d53b8 | 18539:cf25e4efd685 |
|---|