##// END OF EJS Templates
update: mention long options explicitly in description of merge.update()...
muxator -
r34920:1856de4d stable
parent child Browse files
Show More
@@ -1727,11 +1727,11 b' def update(repo, node, branchmerge, forc'
1727 1727 mergeforce = whether the merge was run with 'merge --force' (deprecated): if
1728 1728 this is True, then 'force' should be True as well.
1729 1729
1730 The table below shows all the behaviors of the update command
1731 given the -c and -C or no options, whether the working directory
1732 is dirty, whether a revision is specified, and the relationship of
1733 the parent rev to the target rev (linear or not). Match from top first. The
1734 -n option doesn't exist on the command line, but represents the
1730 The table below shows all the behaviors of the update command given the
1731 -c/--check and -C/--clean or no options, whether the working directory is
1732 dirty, whether a revision is specified, and the relationship of the parent
1733 rev to the target rev (linear or not). Match from top first. The -n
1734 option doesn't exist on the command line, but represents the
1735 1735 experimental.updatecheck=noconflict option.
1736 1736
1737 1737 This logic is tested by test-update-branches.t.
General Comments 0
You need to be logged in to leave comments. Login now