Mercurial > hg
annotate tests/test-merge6.out @ 2146:eb1ed410aa34
run-tests.py: remove trailing white space
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 27 Apr 2006 22:01:57 -0700 |
parents | ced2d3620f95 |
children | b2ae81a7df29 |
rev | line source |
---|---|
616 | 1 pulling from ../B1 |
2 searching for changes | |
3 adding changesets | |
4 adding manifests | |
775 | 5 adding file changes |
1043 | 6 added 1 changesets with 1 changes to 1 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1043
diff
changeset
|
7 (run 'hg heads' to see heads, 'hg merge' to merge) |
616 | 8 bar should remain deleted. |
993 | 9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
616 | 10 pulling from ../A2 |
11 searching for changes | |
12 adding changesets | |
13 adding manifests | |
775 | 14 adding file changes |
1043 | 15 added 1 changesets with 0 changes to 0 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1043
diff
changeset
|
16 (run 'hg heads' to see heads, 'hg merge' to merge) |
616 | 17 bar should remain deleted. |
990 | 18 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |