t / t5100 / msg0017on commit t6036: add a failed conflict detection case with symlink modify/modify (c6d3dd5)
   1New content here
   2