equal
deleted
inserted
replaced
537 [255] |
537 [255] |
538 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
538 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
539 7:a5bfd90a2f29 stable |
539 7:a5bfd90a2f29 stable |
540 $ echo 3 > 1 |
540 $ echo 3 > 1 |
541 $ hg resolve -m 1 |
541 $ hg resolve -m 1 |
542 no more unresolved files |
542 (no more unresolved files) |
543 $ hg graft --continue -O |
543 $ hg graft --continue -O |
544 grafting revision 7 |
544 grafting revision 7 |
545 $ glog --hidden |
545 $ glog --hidden |
546 @ 8:920e58bb443b@default(draft) conflict |
546 @ 8:920e58bb443b@default(draft) conflict |
547 | |
547 | |