Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simplemerge-cmd.out @ 4555:1843d31bfdbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: don't search from path All current callers already pass in the repo root. This normalizes things a bit. Now all repo types take a direct path to repo root and only the command line interface (or the dispatcher) searches from the current directory.
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Jun 2007 21:09:24 -0500
parents d5c3a70f8422
children ea7b982b6c08
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4360
d5c3a70f8422 polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
1 (binary:application/octet-stream)