Mercurial > evolve
comparison tests/test-evolve-obshistory-split.t @ 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 | 8974a05a49fa |
| children | 522abf1d70b7 b58e45aa9be2 |
comparison
equal
deleted
inserted
replaced
| 4390:312b9e8a4c9c | 4391:054ff759f2fd |
|---|