No longer applies cleanly, but git-am -3 takes care of everything except
for a trivial #include conflict.  I didn't test the result, though :)

Reply via email to