Mercurial > hg

diff mercurial/merge.py @ 6303:577a7da1d44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
two fixes for the pager stuff - open pipe in binary mode - don't start a pager if stdout is not a tty (this prevents test-ssh from hanging if you set ui.usepager=True in run-tests.py)
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 19 Mar 2008 16:54:35 -0300
parents fda369b5779c
children 6aa4a3fa4e60
line wrap: on
line diff