t / t5100 / msg0016on commit mergetool: Skip autoresolved paths (bb0a484)
   1and some content
   2