equal
deleted
inserted
replaced
387 |/ |
387 |/ |
388 o 0 added a |
388 o 0 added a |
389 |
389 |
390 $ hg rebase -r . -d 1 |
390 $ hg rebase -r . -d 1 |
391 rebasing 2:29edef26570b "added c" |
391 rebasing 2:29edef26570b "added c" |
392 1 new orphan changesets |
|
393 $ echo conflict > c |
392 $ echo conflict > c |
394 $ hg amend |
393 $ hg amend |
395 |
394 |
396 $ hg log -G -T "{rev} {desc}\n" |
395 $ hg log -G -T "{rev} {desc}\n" |
397 @ 5 added c |
396 @ 5 added c |
398 | |
397 | |
399 | * 3 added d, modified c |
398 | o 3 added d, modified c |
400 | | |
399 | | |
401 | x 2 added c |
400 | x 2 added c |
402 | | |
401 | | |
403 o | 1 rename a to b |
402 o | 1 rename a to b |
404 |/ |
403 |/ |