summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml
Commit message (Expand)AuthorAgeFilesLines
* Update CHANGELOG.md for 9.1.0Felipe Artur2017-04-221-4/+0
* Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8Sean McGivern2017-03-151-0/+4