D2889: filemerge: make the 'local' path match the format that 'base' and 'other' use

[spectral (Kyle Lippincott)]

spectral added a comment.


  In https://phab.mercurial-scm.org/D2889#46482, @yuja wrote:
  
  > Not reviewed yet, but this can't be applied cleanly. Can you rebase?
  
  
  This series should rebase cleanly onto https://phab.mercurial-scm.org/rHGa4a95bd7158de9e932ccf5e8d60095609fbe9994 (which was accepted by pulkit separately from the rest of the series).  I've rebase these three remaining ones and pushed.

REPOSITORY
  rHG Mercurial

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

To: spectral, #hg-reviewers, yuja
Cc: yuja, mercurial-devel