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 file '.hglf/large1' was deleted in local [dest] but was modified in other [source]. |
614 file '.hglf/large1' was deleted in other [source] but was modified in local [dest]. |
615 What do you want to do? |
615 What do you want to do? |
616 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
616 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
617 |
617 |
618 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
618 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
619 -e5bb990443d6a92aaf7223813720f7566c9dd05b |
619 -e5bb990443d6a92aaf7223813720f7566c9dd05b |