Mercurial > evolve
comparison tests/test-grab.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 | 424b498aac00 |
| children |
comparison
equal
deleted
inserted
replaced
| 4390:312b9e8a4c9c | 4391:054ff759f2fd |
|---|---|
| 22 | 22 |
| 23 move a commit on the top of working directory parent and updates to it. | 23 move a commit on the top of working directory parent and updates to it. |
| 24 | 24 |
| 25 options: | 25 options: |
| 26 | 26 |
| 27 -r --rev REV revision to pick | 27 -r --rev REV revision to pick |
| 28 -c --continue continue interrupted pick | 28 -c --continue continue interrupted pick |
| 29 -a --abort abort interrupted pick | 29 -a --abort abort interrupted pick |
| 30 -t --tool TOOL specify merge tool | |
| 30 | 31 |
| 31 (some details hidden, use --verbose to show complete help) | 32 (some details hidden, use --verbose to show complete help) |
| 32 | 33 |
| 33 $ mkcommit a | 34 $ mkcommit a |
| 34 $ mkcommit b | 35 $ mkcommit b |