From efc587b04a40fb84004690694004ec4641bb82dd Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 7 Jul 2018 00:50:17 +0100 Subject: git-debrebase: Improve grammar if one blocking snag. Signed-off-by: Ian Jackson --- debian/changelog | 1 + git-debrebase | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4acfcb8..f9e2afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dgit (5.8~) unstable; urgency=medium * git-debrebase status: Fix commit reporting. Closes:903131. * git-debrebase new-upstream: Add a -1 revision if the user didn't supply one. Closes:#903127. + * git-debrebase: Improve grammar if one blocking snag. * dgit(1): Unscramble push[-source] descriptions. Closes:#903116. -- diff --git a/git-debrebase b/git-debrebase index c28a775..f16a89c 100755 --- a/git-debrebase +++ b/git-debrebase @@ -270,7 +270,7 @@ sub snags_maybe_bail () { $us, $snags_tripped; } else { fail sprintf - "%s: snags: %d blockers (you could -f, or --force)", + "%s: snags: %d blocker(s) (you could -f, or --force)", $us, $snags_tripped; } } -- cgit v1.2.3