Allow merging a specific file
Reduce add/add conflicts with matching prefix/suffix lines
Add support for --untabify
--untabify