Replace tabs with spaces before merge: --expandtab

[borisbrodski]

Speficy

--expandtab={count-of-space}

to replace all indentation tabs with specified amount of spaces prior to the git merge.

Note: this is just a subset of the git's -Xignore-all-space functionality. Misalignment after the tab replacement will still result in the merge conflicts.

Closes: #13