Mercurial > public > mercurial-scm > hg
diff tests/test-merge2.out @ 767:61ed30e82b27
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-merge2.out Fri Jul 22 19:45:48 2005 -0800 +++ b/tests/test-merge2.out Fri Jul 22 19:46:02 2005 -0800 @@ -27,6 +27,7 @@ + hg update 0 + echo This is file b2 + hg commit -A -m 'commit #2' -d '0 0' +adding b + cd .. + /bin/rm -rf t + mkdir t @@ -43,5 +44,6 @@ + hg update 0 + echo This is file b2 + hg commit -A -m 'commit #2' -d '0 0' +adding b + cd .. + /bin/rm -rf t