equal
deleted
inserted
replaced
417 diff --git a/a/a b/a/a |
417 diff --git a/a/a b/a/a |
418 --- a/a/a |
418 --- a/a/a |
419 +++ b/a/a |
419 +++ b/a/a |
420 @@ -1,2 +1,6 @@ |
420 @@ -1,2 +1,6 @@ |
421 a |
421 a |
422 +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit |
422 +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit |
423 c |
423 c |
424 +======= |
424 +======= |
425 +a |
425 +a |
426 +>>>>>>> shelve: 203c9f771d2b - shelve: changes to: [mq]: second.patch |
426 +>>>>>>> shelved change: 203c9f771d2b - shelve: changes to: [mq]: second.patch |
427 diff --git a/b/b b/b.rename/b |
427 diff --git a/b/b b/b.rename/b |
428 rename from b/b |
428 rename from b/b |
429 rename to b.rename/b |
429 rename to b.rename/b |
430 diff --git a/c b/c.copy |
430 diff --git a/c b/c.copy |
431 copy from c |
431 copy from c |
1383 $ hg ci -m 'add C to bars' |
1383 $ hg ci -m 'add C to bars' |
1384 $ hg unshelve -i |
1384 $ hg unshelve -i |
1385 unshelving change 'default-01' |
1385 unshelving change 'default-01' |
1386 rebasing shelved changes |
1386 rebasing shelved changes |
1387 merging bar1 |
1387 merging bar1 |
|
1388 warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark') |
1388 merging bar2 |
1389 merging bar2 |
1389 warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark') |
|
1390 warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark') |
1390 warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark') |
1391 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
1391 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
1392 [240] |
1392 [240] |
1393 |
1393 |
1394 $ cat > bar1 <<EOF |
1394 $ cat > bar1 <<EOF |