diff options
| author | zeripath <art27@cantab.net> | 2022-02-02 04:46:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 12:46:10 +0800 |
| commit | 92e81e97e848f95af437694297105ec8fa18365e (patch) | |
| tree | ae1a5fefba29e147fef07b207787e2d1a537617f /models/commit.go | |
| parent | 5469e61a8e750daad05ddc8b9b2110b1cda4bb68 (diff) | |
| download | gitea-92e81e97e848f95af437694297105ec8fa18365e.tar.gz gitea-92e81e97e848f95af437694297105ec8fa18365e.zip | |
Detect conflicts with 3way merge (#18536)
* Detect conflicts with 3way merge
Unforunately git apply --3way reports conflicts differently than standard patches
resulting in conflicts being missed.
Adjust the conflict detection code to account for this different error reporting.
Fix #18514
Signed-off-by: Andrew Thornton <art27@cantab.net>
* and three-way failed
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'models/commit.go')
0 files changed, 0 insertions, 0 deletions