Mercurial > hg

diff mercurial/scmposix.py @ 26767:69a121c378ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 23c995ed466b
children 39087ee88835
line wrap: on
line diff