diff options
| author | zeripath <art27@cantab.net> | 2021-09-27 13:19:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 13:19:34 +0100 |
| commit | 920608e592549fa18991758eb2aa1761cfb8c6ba (patch) | |
| tree | 2cd5fd512782719d5936f724e680fdbc7a4fb45e /options/locale/locale_en-US.ini | |
| parent | 123f0aea00687d98893036e252efa7ff672b3ad5 (diff) | |
| download | gitea-920608e592549fa18991758eb2aa1761cfb8c6ba.tar.gz gitea-920608e592549fa18991758eb2aa1761cfb8c6ba.zip | |
Support direct comparison (git diff a..b) as well merge comparison (a...b) (#16635)
This PR changes the compare page to make the "..." in the between branches a clickable
link. This changes the comparison type from "..." to "..". Similarly it makes the
initial compare icon clickable to switch the head and base branches.
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'options/locale/locale_en-US.ini')
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3d43b99c31..e6a29a5c8a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1386,6 +1386,8 @@ pulls.compare_changes = New Pull Request pulls.compare_changes_desc = Select the branch to merge into and the branch to pull from. pulls.compare_base = merge into pulls.compare_compare = pull from +pulls.switch_comparison_type = Switch comparison type +pulls.switch_head_and_base = Switch head and base pulls.filter_branch = Filter branch pulls.no_results = No results found. pulls.nothing_to_compare = These branches are equal. There is no need to create a pull request. |