Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 2562:a020024c5870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify make_filename, fix hg cat bug hg cat was using file-level rev/node ids for generating filename templates. This simplifies make_filename to only use changeset rev/node ids.
author Matt Mackall <mpm@selenic.com>
date Wed, 28 Jun 2006 17:06:56 -0500
parents b2ae81a7df29
children
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)