comparison tests/test-simplemerge.py @ 34580:7259f0ddfc0f

fsmonitor: update to match new dirstate refactor The dirstate was refactored so dirstate._map is now at dirstate._map._map. Same for _copymap, is not _map.copymap. It seems none of the mercurial tests cover this stuff, but it was caught by our Facebook extension tests. Differential Revision: https://phab.mercurial-scm.org/D945
author Durham Goode <durham@fb.com>
date Mon, 09 Oct 2017 12:47:22 -0700
parents 68c43a416585
children f0b6fbea00cf
comparison
equal deleted inserted replaced
34579:1b59287a1cfa 34580:7259f0ddfc0f