Mercurial > hg

diff mercurial/merge.py @ 16952:d1a0ac9b6b8a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-commit: remove extra cd .. This specific cd .. leaves the base directory of the test ($TESTTMP). Removing it avoids that test artifacts (e.g. files) are created outside of the base directory.
author Adrian Buehlmann <adrian@cadifra.com>
date Sat, 09 Jun 2012 14:20:25 +0200
parents ebf6d38c9063
children 525fdb738975
line wrap: on
line diff