comparison docs/tutorial/test-training.t @ 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 8406d9b06130
comparison
equal deleted inserted replaced
3775:fa7b94606024 3776:2d450974bb1c