RelNoteson commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1Documentation/RelNotes/1.7.9.6.txt