Merge branch 'rl/maint-stash-i18n-save-error' into maint

i18n marking for an error message for "git stash --notavalidoption"
was incorrect.

By Ross Lagerwall
* rl/maint-stash-i18n-save-error:
  stash: use eval_gettextln correctly
This commit is contained in:
Junio C Hamano 2012-05-03 15:24:22 -07:00
commit beac07eab9

View File

@ -199,8 +199,8 @@ save_stash () {
# $ git stash save --blah-blah 2>&1 | head -n 2
# error: unknown option for 'stash save': --blah-blah
# To provide a message, use git stash save -- '--blah-blah'
eval_gettextln "$("error: unknown option for 'stash save': \$option
To provide a message, use git stash save -- '\$option'")"
eval_gettextln "error: unknown option for 'stash save': \$option
To provide a message, use git stash save -- '\$option'"
usage
;;
*)