Mercurial > hg

diff hgext/convert/p4.py @ 28020:cffa46cbdb8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: tell _checkunknownfiles about whether this was merge --force In an upcoming patch we'll have different behavior here for when 'merge --force' is used as opposed to when other kinds of force operations are performed, like rebases.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 01 Feb 2016 20:28:32 -0800
parents aaa33ec3c951
children 630f5f04bc74
line wrap: on
line diff