comparison mercurial/pvec.py @ 26767:69a121c378ef

localrepo.commit: abort if merge driver's conclude step hasn't been run yet This case also requires 'hg resolve --all' to be run before continuing.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 01:02:32 -0700
parents bcc319d936a3
children 983e93d88193
comparison
equal deleted inserted replaced
26766:a83110faece1 26767:69a121c378ef