1.2.0
* Allow usage both as a Git mergetool and also standalone for any file with conflict markers. * Add light error handling. * Add support for matching mixed Windows/UNIX line endings.
* Allow usage both as a Git mergetool and also standalone for any file with conflict markers. * Add light error handling. * Add support for matching mixed Windows/UNIX line endings.