t / t5100 / patch0007on commit mergetool: Skip autoresolved paths (bb0a484)
   1