Mercurial > hg

diff mercurial/merge.py @ 7604:7c4765d51c3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: shrink wait interval for test-convert-bzr-merges
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 05 Jan 2009 18:45:20 +0100
parents 865c5be0f8df
children 89207edf3973
line wrap: on
line diff