equal
deleted
inserted
replaced
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 |