439     force = whether to force branch merging or file overwriting

   439     force = whether to force branch merging or file overwriting

   440     partial = a function to filter file lists (dirstate not updated)

   440     partial = a function to filter file lists (dirstate not updated)

   441     wlock = working dir lock, if already held

   441     wlock = working dir lock, if already held

   442     """

   442     """

   443 

   443 

   444     if not wlock:

   447     if not wlock:

   445         wlock = repo.wlock()

   448         wlock = repo.wlock()

   446 

   449 

   447     overwrite = force and not branchmerge

   450     overwrite = force and not branchmerge

   448     forcemerge = force and branchmerge

   451     forcemerge = force and branchmerge