comparison tests/test-pick.t @ 6074:55e9987b8384 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 14:04:23 +0300
parents 82da27321e91 e82ad19eb3cc
children 897200013007
comparison
equal deleted inserted replaced
6073:6b67f26f4667 6074:55e9987b8384
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