merge-recursive: Fix multiple file rename across D/F conflict
[git] / Documentation / .gitattributes
1 *.txt whitespace