D3692: merge: add a 'keepconflictparent' argument to graft

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Fri Jun 29 15:07:59 EDT 2018


pulkit accepted this revision.
pulkit added a comment.


  Looks like this will help fixing issue5927 <https://bz.mercurial-scm.org/show_bug.cgi?id=5927> too.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3692

To: lothiraldan, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel


More information about the Mercurial-devel mailing list