RelNoteson commit Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more (216d29e)
   1Documentation/RelNotes/2.2.0.txt