diff .hgtags @ 32057:e5ffc91a2276 stable

histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 20 Apr 2017 17:18:08 -0700
parents f64ac87d82f9
children b9cd7967225f
line wrap: on
line diff