1831     mergeancestor = whether it is merging with an ancestor. If true,

  1831     mergeancestor = whether it is merging with an ancestor. If true,

  1832       we should accept the incoming changes for any prompts that occur.

  1832       we should accept the incoming changes for any prompts that occur.

  1833       If false, merging with an ancestor (fast-forward) is only allowed

  1833       If false, merging with an ancestor (fast-forward) is only allowed

  1834       between different named branches. This flag is used by rebase extension

  1834       between different named branches. This flag is used by rebase extension

  1835       as a temporary fix and should be avoided in general.

  1835       as a temporary fix and should be avoided in general.

  1837     mergeforce = whether the merge was run with 'merge --force' (deprecated): if

  1837     mergeforce = whether the merge was run with 'merge --force' (deprecated): if

  1838       this is True, then 'force' should be True as well.

  1838       this is True, then 'force' should be True as well.

  1839 

  1839 

  1840     The table below shows all the behaviors of the update command given the

  1840     The table below shows all the behaviors of the update command given the

  1841     -c/--check and -C/--clean or no options, whether the working directory is

  1841     -c/--check and -C/--clean or no options, whether the working directory is