merge: move the filtering of ambiguous files to a dedicated function
I have multiple reasons:
- The body of `_update` is way too long
- This adds typing which will help our tooling and brains understand this
code more easily
- This function will get more nested and complex in the next patch
I've taken the liberty of rewrapping and typo-passing the docstring.
$ cat >> $HGRCPATH << EOF
> [extensions]
> fastannotate=
> EOF
$ hg init repo
$ cd repo
changes to whitespaces
$ cat >> a << EOF
> 1
>
>
> 2
> EOF
$ hg commit -qAm '1'
$ cat > a << EOF
> 1
>
> 2
>
>
> 3
> EOF
$ hg commit -m 2
$ hg fastannotate -wB a
0: 1
0:
1: 2
0:
1:
1: 3