summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/allow-resolving-conflicts-in-utf-8.yml
blob: c3c877423ff27d6361f8083610c2a6e4800df507 (plain)
1
2
3
4
---
title: Fix conflict resolution when files contain valid UTF-8 characters
merge_request:
author: