Mercurial > hg
comparison Makefile @ 30272:3d38a0bc774f
cmdutil: refactor checkunresolved
localrepo.commit had code to check for unresolved merge conflicts,
it would be helpful for at least rebase to be able to use that
code without calling commit().
author | timeless <timeless@mozdev.org> |
---|---|
date | Wed, 02 Nov 2016 18:45:53 +0000 |
parents | 730c7fc8889a |
children | 06b17f6c6559 |
comparison
equal
deleted
inserted
replaced
30271:0fa1a41d04e4 | 30272:3d38a0bc774f |
---|