RelNoteson commit Merge branch 'jc/merge-symlink-ours-theirs' into maint (ff19620)
   1Documentation/RelNotes/2.16.1.txt