t / t5100 / msg0015on commit mergetool: Skip autoresolved paths (bb0a484)
   1  - a list
   2  - of stuff