mercurial/merge.py
changeset 28019 e81d11794036
parent 28018 3feadb0b6c34
child 28020 cffa46cbdb8f
equal deleted inserted replaced
28018:3feadb0b6c34 28019:e81d11794036
  1355     mergeancestor = whether it is merging with an ancestor. If true,
  1355     mergeancestor = whether it is merging with an ancestor. If true,
  1356       we should accept the incoming changes for any prompts that occur.
  1356       we should accept the incoming changes for any prompts that occur.
  1357       If false, merging with an ancestor (fast-forward) is only allowed
  1357       If false, merging with an ancestor (fast-forward) is only allowed
  1358       between different named branches. This flag is used by rebase extension
  1358       between different named branches. This flag is used by rebase extension
  1359       as a temporary fix and should be avoided in general.
  1359       as a temporary fix and should be avoided in general.
       
  1360     labels = labels to use for base, local and other
  1360 
  1361 
  1361     The table below shows all the behaviors of the update command
  1362     The table below shows all the behaviors of the update command
  1362     given the -c and -C or no options, whether the working directory
  1363     given the -c and -C or no options, whether the working directory
  1363     is dirty, whether a revision is specified, and the relationship of
  1364     is dirty, whether a revision is specified, and the relationship of
  1364     the parent rev to the target rev (linear, on the same named
  1365     the parent rev to the target rev (linear, on the same named