changeset 4361 | 46280c004f22 |
parent 2175 | b2ae81a7df29 |
child 4385 | 93a4e72b4f83 |
--- a/tests/test-conflict.out +++ b/tests/test-conflict.out @@ -1,5 +1,5 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -merge: warning: conflicts during merge +warning: conflicts during merge. merging a merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved