Mercurial > hg
comparison CONTRIBUTORS @ 45619:e8078af6af30
merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED
ACTION_KEEP_NEW and ACTION_CHANGED_DELETED are conflicting actions as one says
that file is new while other says that file was present earlier and has
changed-delete conflicts.
Let's do changed-delete which will lead to conflicts and make user choose the
right way.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 30 Sep 2020 18:07:21 +0530 |
parents | c29efd272395 |
children |
comparison
equal
deleted
inserted
replaced
45618:29c1d2401823 | 45619:e8078af6af30 |
---|