D7824: tests: add test of rebase with conflict in merge commit

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> test-rebase-conflicts.t:460
> +It's weird that the current parents are not 7 and 8 since that's what we're
> +merging
> +  $ hg tglog

I think it will be weird to have current parents as 7 and 8. Rebase copies commit, so if there is a merge commit, it copies it instead of recreating one. Also if we have 7 and 8 as parents, we might not have correct conflicts.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7824/new/

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

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