Mercurial > hg > pyhgsh

diff tests/test-merge5.out @ 767:61ed30e82b27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update tests to match new addremove chattiness.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 22 Jul 2005 19:46:02 -0800
parents 7e4843b7efd2
children 1f9ec150a476 8f5637f0a0c0 0902ffece4b4
line wrap: on
line diff
--- a/tests/test-merge5.out	Fri Jul 22 19:45:48 2005 -0800
+++ b/tests/test-merge5.out	Fri Jul 22 19:46:02 2005 -0800
@@ -10,6 +10,7 @@
 + hg update 0
 + rm b
 + hg commit -A '-mcomment #2' -d '0 0'
+removing b
 + yes k
 + hg update 1
 this update spans a branch affecting the following files: