D6351: tests: update annotate tests to work around simplemerge bug

[martinvonz (Martin von Zweigbergk)]

martinvonz planned changes to this revision.
martinvonz added inline comments.

INLINE COMMENTS

> test-fastannotate-hg.t:355-357
>  (rev 1 adds two "a"s and rev 6 deletes one "a".
>   the "a" that rev 6 deletes could be either the first or the second "a" of those two "a"s added by rev 1.
>   and that causes the line number difference)

Hmm, I didn't notice this part until now. I guess I'll have to update this too.

REPOSITORY
  rHG Mercurial

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

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