t / t5100 / patch0008on commit t6036: add a failed conflict detection case: regular files, different modes (5d1daf3)
   1