t / t5100 / msg0001on commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1Here is a patch from A U Thor.
   2