cherry-pick/revert: add scissors line on merge conflict
[git] / t / t5100 / msg0009
1 This is to fix diff-format documentation.
2