599   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'

   599   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'

   600   7:a5bfd90a2f29 stable

   600   7:a5bfd90a2f29 stable

   601   $ echo 3 > 1

   601   $ echo 3 > 1

   602   $ hg resolve -m 1

   602   $ hg resolve -m 1

   603   (no more unresolved files)

   603   (no more unresolved files)

   604   $ hg graft --continue -O

   605   $ hg graft --continue -O

   605   grafting 7:a5bfd90a2f29 "conflict" (tip)

   606   grafting 7:a5bfd90a2f29 "conflict" (tip)

   606   $ glog --hidden

   607   $ glog --hidden

   607   @  8:920e58bb443b@default(draft) conflict

   608   @  8:920e58bb443b@default(draft) conflict

   608   |

   609   |