Mercurial > evolve
diff docs/concepts.rst @ 4391:054ff759f2fd
pick: add --tool for hg pick to specify mergetool
This patch used configuration override to enable you to pass a mergetool via the
--tool flag in case there is any merge conflict.
author | Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> |
---|---|
date | Sun, 03 Feb 2019 17:03:02 +0530 |
parents | c3ecf6871872 |
children | 803d32f4e498 |