equal
deleted
inserted
replaced
36 % cat |
36 % cat |
37 expand $Id$ |
37 expand $Id$ |
38 do not process $Id: |
38 do not process $Id: |
39 xxx $ |
39 xxx $ |
40 ignore $Id$ |
40 ignore $Id$ |
|
41 % no kwfiles |
|
42 % untracked candidates |
|
43 k a |
41 % addremove |
44 % addremove |
42 adding a |
45 adding a |
43 adding b |
46 adding b |
44 % status |
47 % status |
45 A a |
48 A a |
175 % touch copied c |
178 % touch copied c |
176 % status |
179 % status |
177 % kwfiles |
180 % kwfiles |
178 a |
181 a |
179 c |
182 c |
|
183 % ignored files |
|
184 I b |
|
185 I sym |
|
186 % all files |
|
187 K a |
|
188 K c |
|
189 I b |
|
190 I sym |
180 % diff --rev |
191 % diff --rev |
181 diff -r ef63ca68695b c |
192 diff -r ef63ca68695b c |
182 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
193 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
183 @@ -0,0 +1,3 @@ |
194 @@ -0,0 +1,3 @@ |
184 +expand $Id$ |
195 +expand $Id$ |
394 created new head |
405 created new head |
395 merging m |
406 merging m |
396 warning: conflicts during merge. |
407 warning: conflicts during merge. |
397 merging m failed! |
408 merging m failed! |
398 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
409 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
399 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
410 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
400 % keyword stays outside conflict zone |
411 % keyword stays outside conflict zone |
401 $Id$ |
412 $Id$ |
402 <<<<<<< local |
413 <<<<<<< local |
403 bar |
414 bar |
404 ======= |
415 ======= |