Mercurial > hg
comparison hgext/convert/__init__.py @ 28020:cffa46cbdb8f
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 | 44cc9f63a2f1 |
| children | 4817c17a11a2 |
comparison
equal
deleted
inserted
replaced
| 28019:e81d11794036 | 28020:cffa46cbdb8f |
|---|