Fixups for hg grep
- kill trimuser function
- remove ucache
- simplify descending logic
- fix files with matches logic
- correct tests
Test that we notice the empty files from the second parent during a merge
This didn't work with 0.9.1, but was fixed by
05257fd28591.