chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: Improve grammar if one blocking snag.
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index c28a775ce87261022855fcbb753c6d8b82ee9056..f16a89c193b7830309d820b053a1299a06daf710 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-270,7
+270,7
@@
sub snags_maybe_bail () {
$us, $snags_tripped;
} else {
fail sprintf
- "%s: snags: %d blocker
s
(you could -f<tag>, or --force)",
+ "%s: snags: %d blocker
(s)
(you could -f<tag>, or --force)",
$us, $snags_tripped;
}
}