Mercurial > hg

diff mercurial/node.py @ 18539:cf25e4efd685

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 25e572394f5c
children 1a5211f2f87f
line wrap: on
line diff