rebase: implement --merge via the interactive machinery
[git] / sha1dc / .gitattributes
1 * whitespace=-indent-with-non-tab