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. -- Hannes -- 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