Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge1.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 | 5a034646e472 |
children | 67a28636ea64 |
rev | line source |
---|---|
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
1 merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
2 merging b |
430 | 3 This is file b1 |
4 merging for b | |
5 merging b | |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
6 merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
7 merging b |