diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 18:08:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-08 18:08:15 +0300 |
| commit | e18e22ce4c7a4ee0680adda25e4cfa9cf4bb1be4 (patch) | |
| tree | ad5cdd2a994e9ae4627330769eb5004f49d6f435 /app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue | |
| parent | cdda3d117c99cadf295f26abc92cb2456033b762 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue index f7fba496e9c..20ee9a17fa0 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_resolver_app.vue @@ -31,7 +31,7 @@ export default { }, inject: ['mergeRequestPath', 'sourceBranchPath', 'resolveConflictsPath'], i18n: { - commitStatSummary: __('Showing %{conflict} between %{sourceBranch} and %{targetBranch}'), + commitStatSummary: __('Showing %{conflict}'), resolveInfo: __( 'You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}', ), |