mercurial/merge.py
changeset 48590 7e503eff3c76
parent 48450 b5f8d9e55d42
child 48698 937998e43e93
equal deleted inserted replaced
48589:a51c522c0064 48590:7e503eff3c76
  2278     return _update(
  2278     return _update(
  2279         ctx.repo(),
  2279         ctx.repo(),
  2280         ctx.rev(),
  2280         ctx.rev(),
  2281         branchmerge=False,
  2281         branchmerge=False,
  2282         force=False,
  2282         force=False,
  2283         labels=[b'working copy', b'destination'],
  2283         labels=[b'working copy', b'destination', b'working copy parent'],
  2284         updatecheck=updatecheck,
  2284         updatecheck=updatecheck,
  2285         wc=wc,
  2285         wc=wc,
  2286     )
  2286     )
  2287 
  2287 
  2288 
  2288