Mercurial > hg

diff mercurial/merge.py @ 7781:a45206455d85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keepalive: borrow code from newer httplib to patch ValueError (issue1088)
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Feb 2009 17:37:23 -0600
parents 5bf5fd1e2a74
children 89e05c02a4af
line wrap: on
line diff