Mercurial > hg

view tests/test-merge4.out @ 4255:ef1f1a4b2efb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
glob:<directory> patterns match the files in that directory. This makes the behaviour of glob: patterns more consistent: hg status glob:dir and hg status -I glob:dir will match the same files. It's also consistent with the fact that {rel,}path patterns recursively match the contents of a directory.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 20 Mar 2007 22:09:55 -0300
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)