Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 2692:2ab464771b7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile do a chmod +x on test sceanrios
author "Mathieu Clabaut <mathieu.clabaut@gmail.com>"
date Wed, 26 Jul 2006 21:01:36 +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)