Mercurial > hg
comparison README.rst @ 42561:44e99811bea7
tweakdefaults: make hg resolve require --re-merge flag to re-merge
Pulkit suggested it in https://phab.mercurial-scm.org/D4379, and a
discussion with Octobus people reminded me that people still use the
error-prone default behavior of `hg resolve`.
Differential Revision: https://phab.mercurial-scm.org/D6610
author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
---|---|
date | Sat, 06 Jul 2019 19:55:29 -0400 |
parents | 1b59287a1cfa |
children | c5912e35d06d |
comparison
equal
deleted
inserted
replaced
42560:70f1a84d0794 | 42561:44e99811bea7 |
---|