Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 14825:de9eb6b1da4f stable 1.9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: rename the util.localpath that uses url to urllocalpath (issue2875) util is never imported by any other name than util, so this is mostly just a simple search and replace from util.localpath to util.urllocalpath (assuming other uses of util.localpath already has been renamed).
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 01 Jul 2011 17:37:09 +0200
parents 88cb01c4575e
children 28e98a8b173d
line wrap: on
line diff