annotate docs/tutorial/.netlify @ 3776:2d450974bb1c stable

evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897) Before this patch, if you do `hg next --evolve` and end up having conflicts and then you try `hg abort`, it will throw a KeyError. This patch fixes that.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 27 May 2018 02:32:58 +0530
parents aad37ffd7d58
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3376
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
1 {"site_id":"cf023865-0eb1-49e9-951b-29555949abf0","path":"html/"}