RelNoteson commit merge: teach -Xours/-Xtheirs to symbolic link merge (fd48b46)
   1Documentation/RelNotes/2.14.2.txt