tests/test-simplemerge.py.out

addremove: only query dirstate once per path

Previously the addremove code queried the dirstate 4 times per path. Now it
only does so once.  On a large repo this brings addremove from 9.5 seconds
to 8.35 seconds (12%).

....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s

OK