Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 3012:fa4229c60dd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow for MB/sec transfer rates in test-http-proxy and test-ssh. Also make the test more specific in test-http.
author Lee Cantey <lcantey@gmail.com>
date Mon, 21 Aug 2006 10:46:58 -0700
parents 962b9c7df641
children db3f42261452 92a0c2200e41
line wrap: on
line diff