Mercurial > hg
view mercurial/__init__.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 | 9117c6561b0b |
children | 4374d819ccd5 |