diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 19:00:14 +0000 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/assets/javascripts/diffs/components/merge_conflict_warning.vue | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
download | gitlab-ce-15.8.0-rc42.tar.gz |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/diffs/components/merge_conflict_warning.vue')
-rw-r--r-- | app/assets/javascripts/diffs/components/merge_conflict_warning.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue index c37a1d75650..6cb1ed4cbcf 100644 --- a/app/assets/javascripts/diffs/components/merge_conflict_warning.vue +++ b/app/assets/javascripts/diffs/components/merge_conflict_warning.vue @@ -36,7 +36,7 @@ export default { <p class="gl-mb-0"> {{ __( - 'Resolve these conflicts or ask someone with write access to this repository to merge it locally.', + 'Resolve these conflicts, or ask someone with write access to this repository to resolve them locally.', ) }} </p> @@ -54,7 +54,7 @@ export default { v-gl-modal-directive="'modal-merge-info'" class="gl-alert-action" > - {{ __('Merge locally') }} + {{ __('Resolve locally') }} </gl-button> </template> </gl-alert> |