merge-recursive: comment and reorder the merge_options fields
[git] / t / t4034 / html / pre
1 <tag>content</tag>
2 <tag attr="value">content</tag>
3 <tag>content &entity;</tag>