| author | Christian Ebert <blacktrash@gmx.net> |
| Fri, 18 Nov 2011 11:06:59 +0000 | |
| changeset 1025 | c1ee4cc36089 |
| parent 1023 | c7a801067441 (current diff) |
| parent 1024 | 0b56a38520af (diff) |
| child 1026 | e419c8a4862b |
| child 1028 | a08af90d2bcc |
--- a/tests/test-keyword.t Wed Nov 16 12:55:59 2011 +0000 +++ b/tests/test-keyword.t Fri Nov 18 11:06:59 2011 +0000 @@ -976,7 +976,7 @@ $ hg merge merging m warning: conflicts during merge. - merging m failed! + merging m incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1]