equal
deleted
inserted
replaced
609 $ hg rebase --continue --config ui.interactive=True <<EOF |
609 $ hg rebase --continue --config ui.interactive=True <<EOF |
610 > c |
610 > c |
611 > EOF |
611 > EOF |
612 rebasing 1:72518492caa6 "#1" |
612 rebasing 1:72518492caa6 "#1" |
613 rebasing 4:07d6153b5c04 "#4" |
613 rebasing 4:07d6153b5c04 "#4" |
614 local changed .hglf/large1 which remote deleted |
614 local [dest] changed .hglf/large1 which remote [source] deleted |
615 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
615 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
616 |
616 |
617 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
617 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
618 -e5bb990443d6a92aaf7223813720f7566c9dd05b |
618 -e5bb990443d6a92aaf7223813720f7566c9dd05b |
619 +8a4f783556e7dea21139ca0466eafce954c75c13 |
619 +8a4f783556e7dea21139ca0466eafce954c75c13 |