On Fri, Oct 22, 2010 at 09:18, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote: > I just noticed these message after a 'git am' invocation: > > When you have resolved this problem run gitam--resolved. > If you would prefer to skip this patch, instead run gitam--skip. > To restore the original branch and stop patching run gitam--abort. > > Notice the missing blanks in the suggested commands. > > This is on Windows. I have ab/i18n (a102b434c) merged, but compiled with > NO_GETTEXT. This is the message in the code: eval_gettext "When you have resolved this problem run \"\$cmdline --resolved\". If you would prefer to skip this patch, instead run \"\$cmdline --skip\". To restore the original branch and stop patching run \"\$cmdline --abort\"."; echo And presumably you're using these functions from git-sh-i18n.sh: gettext () { printf "%s" "$1" } eval_gettext () { gettext_eval="printf '%s' \"$1\"" printf "%s" "`eval \"$gettext_eval\"`" } So maybe the shell on Windows doesn't behave the same way wih regards to eval_gettext()? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html