merge: teach -Xours/-Xtheirs to binary ll-merge driver
[git] / t / t5100 / msg0016
1 and some content
2