# Since 1.0.6

* Upgrade Diff dependency to 0.4

# Since 1.0.5

* Allow merging a specific file

* Reduce add/add conflicts with matching prefix/suffix lines

* Add support for `--untabify`