Mercurial > hg

comparison contrib/simplemerge @ 36844:eeb87b24aea7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: abort if unresolved merge conflicts found (issue5805) It was checked by repo.commit() before e8a7c1a0565a "cmdutil: remove the redundant commit during amend."
author Yuya Nishihara <yuya@tcha.org>
date Sun, 11 Mar 2018 20:10:38 +0900
parents d2fc88426d21
children a8a902d7176e
comparison
equal deleted inserted replaced
36759:9639c433be54 36844:eeb87b24aea7