Mercurial > hg

comparison mercurial/merge.py @ 9448:bc6b0fef9495

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
windows: provide filename in IOError exceptions This brings the Windows posixfile errors in line with the errors on other platforms.
author Steve Borho <steve@borho.org>
date Mon, 14 Sep 2009 19:53:43 -0500
parents ab668c92a036
children 3f56055ff1d7
comparison
equal deleted inserted replaced
9442:080227f584a1 9448:bc6b0fef9495