Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge1.out @ 1122:fb008a1a0a32
Use .has_option to avoid the unknown Exception.
author | Ollivier Robert <roberto@keltia.freenix.fr> |
---|---|
date | Sat, 27 Aug 2005 23:44:02 -0700 |
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 |