Mercurial > hg

diff hgext/censor.py @ 26621:36383507a6f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: perform all premerges before performing any file merges (BC) Just like the BC to merge before it, this allows for a maximally consistent state before providing any prompts to the user.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 23:58:07 -0700
parents 56b2bcea2529
children 1aee2ab0f902
line wrap: on
line diff