How to resolve git-am conflict (possible bug)

When trying to pally patch generated by qgit (in attachement) to current
version of my private development branch (current version of file to be
patched in attachement), I have encountered git-am patch conflict.

First, there is no mention of _how_ to resolve conflict in git-am, besides
the fact that you need to git-update-index resolved files.

Second, in my case git-am --3way didn't leave merge conflict markers in the
file, nor did it write .rej file, nor did it put different versions od
affected file in stages 1,2,3. Sometimes it did remove affected file (can't
confirm), but it didn't leave <file>~<branch> files (as said by GyrosGeier
on #git).

Third, I wonder why it printed the same error message _twice_. See below for
the sequence of commands and it's output

---
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".
If you would prefer to skip this patch, instead run "git-am -3 --skip".
1081:jnareb@roke:~/git> ll gitweb/gitweb.perl*
-rwxr-xr-x  1 jnareb users 80187 Aug 11 15:18 gitweb/gitweb.perl
1082:jnareb@roke:~/git> git ls-files -s gitweb/gitweb.perl
100755 d917bdf68de2859c805edc9f6fb9ebba1e9ad7d1 0       gitweb/gitweb.perl
1084:jnareb@roke:~/git> git grep ">>>>" gitweb/gitweb.perl || 
  echo "Not found"
Not found

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git