Jeff King [off-list ref] writes:
BTW, since this is inherently a non-git operation, there are other tools
that some may find friendlier than an editor. Kompare will let you
unapply differences, for example, and I would be shocked if emacs didn't
have some tool for this.
M-x diff-mode
<move to bad hunk>
C-u C-c C-a
-Miles
--
Next to fried food, the South has suffered most from oratory.
-- Walter Hines Page