diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index b29e0b1759e7f95fe0e8e41d7725007789b59307..8241e408ce517577a9ed272b29bc21bb7f6413dc 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -76,7 +76,8 @@ def commit
     def try_merge
       repository.merge(current_user, source, merge_request, commit_message)
     rescue Gitlab::Git::PreReceiveError => e
-      raise_error("Something went wrong during merge pre-receive hook: #{e.message}")
+      handle_merge_error(log_message: e.message)
+      raise_error('Something went wrong during merge pre-receive hook')
     rescue => e
       handle_merge_error(log_message: e.message)
       raise_error('Something went wrong during merge')
diff --git a/changelogs/unreleased/sh-show-pre-receive-error-merge.yml b/changelogs/unreleased/sh-show-pre-receive-error-merge.yml
deleted file mode 100644
index 5e662b34773ca60aa808d7f6e1b817cda59df7b0..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/sh-show-pre-receive-error-merge.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Show pre-receive error message when merge fails
-merge_request: 25708
-author:
-type: fixed
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 9d67426325982dab1372c5cee3d0df854443e845..ede79b87bcc381e3055269b28b780e5d20afa6bd 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -244,7 +244,7 @@
 
         service.execute(merge_request)
 
-        expect(merge_request.merge_error).to include("Something went wrong during merge pre-receive hook: #{error_message}")
+        expect(merge_request.merge_error).to include('Something went wrong during merge pre-receive hook')
         expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
       end