Mercurial > evolve
diff CHANGELOG @ 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 | 8494015ec24b |
children | 62a6f8f4e694 |
line wrap: on
line diff
--- a/CHANGELOG Wed Feb 06 13:49:29 2019 +0800 +++ b/CHANGELOG Sun Feb 03 17:03:02 2019 +0530 @@ -6,6 +6,7 @@ * evolve: improved support for content-divergence with public changesets * stack: support ranges in revsets indexing + * pick: add the standard `--tool` option 8.4.0 -- 2019-12-22 -------------------