equal
deleted
inserted
replaced
211 +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
211 +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
212 @@ -0,0 +1,2 @@ |
212 @@ -0,0 +1,2 @@ |
213 +$Id$ |
213 +$Id$ |
214 +tests for different changenodes |
214 +tests for different changenodes |
215 % qpop |
215 % qpop |
216 Patch queue now empty |
216 patch queue now empty |
217 % qgoto - should imply qpush |
217 % qgoto - should imply qpush |
218 applying mqtest.diff |
218 applying mqtest.diff |
219 Now at: mqtest.diff |
219 now at: mqtest.diff |
220 % cat |
220 % cat |
221 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
221 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
222 tests for different changenodes |
222 tests for different changenodes |
223 % qpop and move on |
223 % qpop and move on |
224 Patch queue now empty |
224 patch queue now empty |
225 % copy |
225 % copy |
226 % kwfiles added |
226 % kwfiles added |
227 a |
227 a |
228 c |
228 c |
229 % commit |
229 % commit |
456 created new head |
456 created new head |
457 merging m |
457 merging m |
458 warning: conflicts during merge. |
458 warning: conflicts during merge. |
459 merging m failed! |
459 merging m failed! |
460 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
460 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
461 use 'hg resolve' to retry unresolved file merges |
461 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
462 % keyword stays outside conflict zone |
462 % keyword stays outside conflict zone |
463 $Id$ |
463 $Id$ |
464 <<<<<<< local |
464 <<<<<<< local |
465 bar |
465 bar |
466 ======= |
466 ======= |