diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-16 10:48:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-16 18:52:12 -0700 |
| commit | 7a26e653929025e11e689bc7d98365c9a0107dc9 (patch) | |
| tree | 8af6eb75c4e31acf04f84cb9ca330539dbeb672e /t/t7800-difftool.sh | |
| parent | Splitting a hunk that adds a line at the top fails in "add -p" (diff) | |
| download | tgif-7a26e653929025e11e689bc7d98365c9a0107dc9.tar.xz | |
Revert "git-add--interactive: remove hunk coalescing"
This reverts commit 0beee4c6dec15292415e3d56075c16a76a22af54 but with a
bit of twist, as we have added "edit hunk manually" hack and we cannot
rely on the original line numbers of the hunks that were manually edited.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7800-difftool.sh')
0 files changed, 0 insertions, 0 deletions