Mercurial > hg
comparison mercurial/help/scripting.txt @ 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 | c38afb8c7deb |
children | 7ce05671a5e3 |
comparison
equal
deleted
inserted
replaced
26766:a83110faece1 | 26767:69a121c378ef |
---|