equal
deleted
inserted
replaced
547 > r |
547 > r |
548 > l |
548 > l |
549 > l |
549 > l |
550 > EOF |
550 > EOF |
551 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) |
551 subrepository sub diverged (local revision: f74e50bd9e55, remote revision: d65e59e952a9) |
552 (M)erge, keep (l)ocal or keep (r)emote? m |
552 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
553 subrepository sources for sub differ (in checked out version) |
553 subrepository sources for sub differ (in checked out version) |
554 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r |
554 use (l)ocal source (f74e50bd9e55) or (r)emote source (d65e59e952a9)? r |
555 remote turned local largefile large2 into a normal file |
555 remote turned local largefile large2 into a normal file |
556 keep (l)argefile or use (n)ormal file? l |
556 keep (l)argefile or use (n)ormal file? l |
557 largefile large1 has a merge conflict |
557 largefile large1 has a merge conflict |
613 $ hg rebase --continue --config ui.interactive=True <<EOF |
613 $ hg rebase --continue --config ui.interactive=True <<EOF |
614 > c |
614 > c |
615 > EOF |
615 > EOF |
616 rebasing 1:72518492caa6 "#1" |
616 rebasing 1:72518492caa6 "#1" |
617 rebasing 4:07d6153b5c04 "#4" |
617 rebasing 4:07d6153b5c04 "#4" |
618 local changed .hglf/large1 which remote deleted |
618 local [dest] changed .hglf/large1 which other [source] deleted |
619 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
619 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
620 |
620 |
621 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
621 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
622 -e5bb990443d6a92aaf7223813720f7566c9dd05b |
622 -e5bb990443d6a92aaf7223813720f7566c9dd05b |
623 +8a4f783556e7dea21139ca0466eafce954c75c13 |
623 +8a4f783556e7dea21139ca0466eafce954c75c13 |