2.3.0

What's Changed

• Support for zdiff3 conflict style by @barlik in #25
• Run diffthis before editing files to avoid foldmethod problem by @whiteinge in #29

Full Changelog: 2.2.0...2.3.0

2.2.0

Features:

- Add Mercurial support. (Thanks to Harald Klimach!)
- Add support for the diff3 diff format. (Thanks to @alfunx!)

Bug fixes:

- Set the filetype for the right split.

2.1.0

* Add DiffConflictsWithHistory for both diff and history view.

2.0.0

* Fix incorrect LOCAL, REMOTE window ordering. This is a backward
  incompatible change if you were relying on that behavior. See 05263c1
  for details.
* Avoid "Hit enter to continue" prompt for default cmdheight setting.

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.

1.1.0

* Have Git ignore `doc/tags`.
* Use bang in function definitions to support reloads.
* Account for `splitright`.

Thanks for all the community feedback and contributions!

1.0.0

Initial release.