https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100537
--- Comment #20 from Ian Lance Taylor <ian at airs dot com> --- There's no perfect way to handle the MERGE file on the release branches. What I usually do is to resolve the patch by replacing the existing revision number with the new one. Thanks.
