Mercurial > hg

diff hgext/censor.py @ 35105:795bfa2a9103

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: add InMemoryMergeConflictsError We'll raise this exception in the merge code, and in-memory users like rebase can catch it and retry without IMM. Differential Revision: https://phab.mercurial-scm.org/D1210
author Phil Cohen <phillco@fb.com>
date Wed, 15 Nov 2017 21:07:30 -0800
parents 46ba2cdda476
children 0596d27457c6
line wrap: on
line diff