Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 2975:3091b1153e2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clear contents of global hgrc for tests before running each test. This fixes running test-mq-qdiff after test-mq, because of changed settings.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 22 Aug 2006 09:55:14 +0200
parents 8743188f4d2e
children 545d33aa3f82
line wrap: on
line diff