t / t5100 / msg0006on commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1Here is a patch from A U Thor.
   2