comparison tests/test-pick.t @ 5317:011b53a9d03c mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 22:18:15 +0800
parents 9f69164cdc16 e6e92835d42d
children 82da27321e91
comparison
equal deleted inserted replaced
5316:ae4dbbf2b929 5317:011b53a9d03c
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