Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge5.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