merge: teach -Xours/-Xtheirs to binary ll-merge driver
[git] / t / t5100 / msg0006
1 Here is a patch from A U Thor.
2