Revert "git-add--interactive: remove hunk coalescing"