t / t5100 / msg0006on commit git-rerere: detect unparsable conflicts (a1b32fd)
   1Here is a patch from A U Thor.
   2