diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 15:07:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 15:07:21 +0300 |
| commit | ef58231bd6702495b8d2d1e7ddc2ad66d1a7dc70 (patch) | |
| tree | 49d44d81aa99c000e78e692bca18fdcaa134673a /app/assets/javascripts/diffs | |
| parent | 0a921554d8c33ccbbd1f2edcee8cd70a0ecfd1a2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs')
| -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> |