Jakub Narebski <jnareb@xxxxxxxxx> writes: > 1078:jnareb@roke:~/git> rm -rf .dotest/ > 1079:jnareb@roke:~/git> git reset --hard > 1080:jnareb@roke:~/git> git am --3way --utf8 --keep --binary \ > mdir.0/0001-gitweb-Refactor-git_history_body.txt > > Applying '[PATCH 1/1] gitweb: Refactor git_history_body' > > error: patch failed: gitweb/gitweb.perl:2295 > error: gitweb/gitweb.perl: patch does not apply > error: patch failed: gitweb/gitweb.perl:2295 > error: gitweb/gitweb.perl: patch does not apply > Patch failed at 0001. > When you have resolved this problem run "git-am -3 --resolved". This is not falling back to three-way. One likely reason is you do not have blobs identified on the "index " line of the patch in your repostory. - : 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