polish
diff --git a/Readme.org b/Readme.org --- a/Readme.org +++ b/Readme.org @@ -266,6 +266,7 @@ hg merge --tool internal:merge tip # th sed -i "s/<<<.*local//" plan.txt sed -i "s/====.*/\n/" plan.txt sed -i "s/>>>.*other//" plan.txt +# mark them as solved. hg resolve -m hg commit -m "merge people" echo @@ -298,7 +299,6 @@ sed -i "s/- Portals during dreamtime/- P hg ci -m "Added wild memories to fullfill the wish for action" echo hg log -G -r 19: -cat plan.txt cd .. #+END_SRC @@ -338,7 +338,7 @@ hg log -G -r 19: cd .. #+END_SRC -/note: We use graft here, because using a second amend would just change the changeset in between but not add another change. If there had been more changes after the single followup commit, we would simply have called evolve to fix them. Which would have just worked, because graft -O left an obsolete marker on the grafted changeset, so evolve would have seen how to change all its children./ +/note: We use graft here, because using a second amend would just change the changeset in between but not add another change. If there had been more changes after the single followup commit, we would simply have called evolve to fix them, because graft -O left an obsolete marker on the grafted changeset, so evolve would have seen how to change all its children./ That’s it. All that’s left is fixing the plan, but I’ll rather do that outside this guide :)