| changeset 4365 | 46280c004f22 |
| parent 4304 | 4787e2b0dd03 |
| child 4417 | 0912d8df5e19 |
--- a/tests/test-merge-local.out Mon Apr 16 20:17:39 2007 -0300 +++ b/tests/test-merge-local.out Mon Apr 16 20:17:39 2007 -0300 @@ -36,7 +36,7 @@ M zzz1_merge_ok M zzz2_merge_bad # local merge with conflicts -merge: warning: conflicts during merge +warning: conflicts during merge. merging zzz1_merge_ok merging zzz2_merge_bad merging zzz2_merge_bad failed!