[Estragon]

Magit in emacs is great for this functionality. It will even add just the selected region of the diff.