From 36d6450977e40d8ea994590e3c9fd60184fe93e4 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 5 Jun 2017 00:10:53 -0400 Subject: repo/pull: detect case when no merge base found (#4434) --- conf/locale/locale_en-US.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'conf/locale') 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: %[2]s#%[3]d` pulls.create = Create Pull Request pulls.title_desc = wants to merge %[1]d commits from %[2]s into %[3]s -- cgit v1.2.3