author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Fri, 28 Oct 2005 17:18:50 -0700 | |
changeset 1479 | 1a3c6689ef2b |
parent 1236 | 67a28636ea64 |
child 1581 | db10b7114de0 |
permissions | -rw-r--r-- |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
1 |
%% no merges expected |
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
2 |
%% merge of b expected |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
3 |
merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
4 |
merging b |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
5 |
%% |
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
6 |
Contents of b should be "this is file b1" |
430 | 7 |
This is file b1 |
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
8 |
%% merge expected! |
430 | 9 |
merging for b |
10 |
merging b |
|
1236
67a28636ea64
Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
925
diff
changeset
|
11 |
%% merge of b expected |
407
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
12 |
merging for b |
0e0d0670b2bc
[PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff
changeset
|
13 |
merging b |