Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge3.out @ 1782:b9671b41e360

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 21 Feb 2006 16:46:38 +0100
parents 91c56c427171
children
line wrap: on
line diff
--- a/tests/test-merge3.out
+++ b/tests/test-merge3.out
@@ -1,3 +1,2 @@
 removing b
-b never committed!
 nothing changed