filemerge: work with `simplemerge.MergeInput` in `filemerge()` We currently pass around pairs of file context objects and labels between functions in the `filemerge` module. I plan to pass around `simplemerge.MergeInput` instead. This patch prepares for that by using the type internally in `filemerge.filemerge()`. Differential Revision: https://phab.mercurial-scm.org/D12017

  $ 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