equal
deleted
inserted
replaced
637 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
637 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
638 7:a5bfd90a2f29 |
638 7:a5bfd90a2f29 |
639 $ echo 3 > 1 |
639 $ echo 3 > 1 |
640 $ hg resolve -m 1 |
640 $ hg resolve -m 1 |
641 (no more unresolved files) |
641 (no more unresolved files) |
642 continue: hg grab --continue |
642 continue: hg pick --continue |
643 $ hg grab --continue |
643 $ hg grab --continue |
644 $ glog --hidden |
644 $ glog --hidden |
645 @ 8:fb2c0f0a0c54@default(draft) conflict |
645 @ 8:fb2c0f0a0c54@default(draft) conflict |
646 | |
646 | |
647 | x 7:a5bfd90a2f29@default(draft) conflict |
647 | x 7:a5bfd90a2f29@default(draft) conflict |