Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge3.out @ 925:5a034646e472

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: remove '+ hg' trick This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.
author mpm@selenic.com
date Tue, 16 Aug 2005 19:03:01 -0800
parents 0902ffece4b4
children 91c56c427171
line wrap: on
line diff
--- a/tests/test-merge3.out
+++ b/tests/test-merge3.out
@@ -1,8 +1,3 @@
-+ hg init
-+ hg add a
-+ hg commit -m commit #0 -d 0 0
-+ hg add b
-+ hg commit -A -mcomment #1 -d 0 0
 removing b
 b never committed!
 nothing changed