Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 2773:871ca5b9d348

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import say a file is not tracked after patching : test case
author "Mathieu Clabaut <mathieu.clabaut@gmail.com>"
date Wed, 02 Aug 2006 09:29:17 +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)