Mercurial > evolve
comparison tests/test-pick.t @ 6006:90af9db93d2b mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 12 Aug 2021 22:01:14 +0200 |
parents | 82da27321e91 |
children | 55e9987b8384 |
comparison
equal
deleted
inserted
replaced
6005:2da0e17ca1c0 | 6006:90af9db93d2b |
---|---|
31 | 31 |
32 move a commit on the top of working directory parent and updates to it. | 32 move a commit on the top of working directory parent and updates to it. |
33 | 33 |
34 options: | 34 options: |
35 | 35 |
36 -r --rev REV revision to pick | 36 -r --rev REV revision to pick |
37 -c --continue continue interrupted pick | 37 -c --continue continue interrupted pick |
38 -a --abort abort interrupted pick | 38 -a --abort abort interrupted pick |
39 -t --tool TOOL specify merge tool | 39 -t --tool VALUE specify merge tool |
40 | 40 |
41 (some details hidden, use --verbose to show complete help) | 41 (some details hidden, use --verbose to show complete help) |
42 | 42 |
43 $ mkcommit a | 43 $ mkcommit a |
44 $ mkcommit b | 44 $ mkcommit b |