Mercurial > hg-stable

diff mercurial/merge.py @ 22419:fdfc9faca273

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: move samplehgrcs from config config is generic code that doesn't know about Mercurial usage, so this was at the wrong layer
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Sep 2014 12:26:12 -0500
parents 6f63c47cbb86
children 19903277f035
line wrap: on
line diff