On Thu, 2017-01-26 at 14:50 +0000, David Woodhouse wrote:
> 
> Finally, add a comment clarifying how that 'return -1' works — it isn't
> returning an error and causing the mapping to fail; it relies on…

Btw, something odd happened when committing this. That U+2014 emdash in
the first (cited) line above got turned into a U+0097 'END OF GUARDED
AREA' character. I've no idea why — just using 'git am' should have
worked perfectly normally.