Mercurial > evolve
comparison tests/test-push-checkheads-superceed-A1.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 | 21f06d932231 |
| children | 2280461343e5 62b60fc1983d |
comparison
equal
deleted
inserted
replaced
| 4390:312b9e8a4c9c | 4391:054ff759f2fd |
|---|