Mercurial > hg

diff mercurial/pathutil.py @ 23448:6a92b5fcfba8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: display modify/delete conflict prompts in sorted order The order is determined by manifest.diff(), which currently is not sorted. There are currently no tests for this, but we will soon add some that would be flaky without this patch.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 26 Nov 2014 10:25:27 -0800
parents e53f6b72a0e4
children a4679a74df14
line wrap: on
line diff