diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-29 12:41:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-29 15:26:41 -0700 |
| commit | f3217e2b1791580ce6499b800e93989d312f9718 (patch) | |
| tree | 90427075ad932ea9d69b5e6c8749c77b83a30405 /t/t4013/diff.diff_--stat_initial..side | |
| parent | add -p: 'q' should really quit (diff) | |
| download | tgif-f3217e2b1791580ce6499b800e93989d312f9718.tar.xz | |
t3701: Editing a split hunk in an "add -p" session
Arnaud Lacombe reported that with the recent change to reject overlapping
hunks fed to "git apply", the edit mode of an "add -p" session that lazily
feeds overlapping hunks without coalescing adjacent ones claim that the
patch does not apply. Expose the problem to be fixed.
Cf. http://thread.gmane.org/gmane.comp.version-control.git/170685/focus=171000
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_--stat_initial..side')
0 files changed, 0 insertions, 0 deletions