Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6.out @ 1008:85272e96b96a
Add Makefile for generating release tarballs.
- test suite is run
- documentation is generated and included
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 22 Aug 2005 08:46:43 +0200 |
parents | 5007e0bdeed2 |
children | 6f274afc05c7 |
line wrap: on
line source
pulling from ../B1 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) bar should remain deleted. f405ac83a5611071d6b54dd5eb26943b1fdc4460 644 foo pulling from ../A2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files (run 'hg update' to get a working copy) bar should remain deleted. f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo