Merge branch 'jc/merge-symlink-ours-theirs' into maint
[git] / RelNotes
1 Documentation/RelNotes/2.16.1.txt