0dfe5fa2d6
Backport #18536 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> |
||
---|---|---|
.. | ||
agit | ||
asymkey | ||
attachment | ||
auth | ||
comments | ||
cron | ||
externalaccount | ||
forms | ||
gitdiff | ||
issue | ||
lfs | ||
mailer | ||
migrations | ||
mirror | ||
org | ||
pull | ||
release | ||
repository | ||
task | ||
user | ||
webhook | ||
wiki |