Mercurial > hg

diff mercurial/simplemerge.py @ 16793:9cbc44a6600e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: do not create repos inside repos in test-rename-merge1.t This is no actual problem, but I when adding more tests to this file, the directory structure would become t/repo2089/repoXXXX/repoYYYY/...
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 23 May 2012 17:33:19 +0200
parents e34106fa0dc3
children 4aeb7a6029ba
line wrap: on
line diff