Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge3.out @ 775:122449dd89db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up test results No more errnos diff | sed changes .out message ok
author mpm@selenic.com
date Tue, 26 Jul 2005 19:23:59 -0800
parents 61ed30e82b27
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
line wrap: on
line diff
--- a/tests/test-merge3.out
+++ b/tests/test-merge3.out
@@ -6,5 +6,6 @@
 + hg add b
 + rm b
 + hg commit -A '-mcomment #1' -d '0 0'
+adding .out
 removing b
 b never committed!