Mercurial > evolve
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 4390:312b9e8a4c9c | 4391:054ff759f2fd |
|---|---|
| 4 8.4.0 - in progress | 4 8.4.0 - in progress |
| 5 ------------------- | 5 ------------------- |
| 6 | 6 |
| 7 * evolve: improved support for content-divergence with public changesets | 7 * evolve: improved support for content-divergence with public changesets |
| 8 * stack: support ranges in revsets indexing | 8 * stack: support ranges in revsets indexing |
| 9 * pick: add the standard `--tool` option | |
| 9 | 10 |
| 10 8.4.0 -- 2019-12-22 | 11 8.4.0 -- 2019-12-22 |
| 11 ------------------- | 12 ------------------- |
| 12 | 13 |
| 13 * compat: add compatibility with Mercurial 4.9 | 14 * compat: add compatibility with Mercurial 4.9 |