diff options
| author | Unknwon <u@gogs.io> | 2017-06-05 00:10:53 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-06-05 00:10:53 -0400 |
| commit | 36d6450977e40d8ea994590e3c9fd60184fe93e4 (patch) | |
| tree | 411da811a540a8e6709a770ce392b9d5c58b54a8 /conf/locale | |
| parent | 02a576a6a0ce6522b7b6af70bc2eea2de3f534d6 (diff) | |
repo/pull: detect case when no merge base found (#4434)
Diffstat (limited to 'conf/locale')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 618d4058..a33d7836 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -616,6 +616,7 @@ pulls.compare_compare = compare pulls.filter_branch = Filter branch pulls.no_results = No results found. pulls.nothing_to_compare = There is nothing to compare because base and head branches are even. +pulls.nothing_merge_base = There is nothing to compare because two branches have completely different history. pulls.has_pull_request = `There is already a pull request between these two targets: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>` pulls.create = Create Pull Request pulls.title_desc = wants to merge %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code> |