t / t5100 / patch0007on commit merge-recursive: new function for better colliding conflict resolutions (37b65ce)
   1