Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 2653:b24efed24e8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow specifying a file to hg parents, change the syntax to use -r/--rev
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 17 Jul 2006 02:00:49 +0200
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)