![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:36:46 +0000 (16:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:36:46 +0000 (16:36 -0700) |
* jc/maint-add-p-overlapping-hunks:
t3701: add-p-fix makes the last test to pass
"add -p": work-around an old laziness that does not coalesce hunks
add--interactive.perl: factor out repeated --recount option
t3701: Editing a split hunk in an "add -p" session
add -p: 'q' should really quit
t3701: add-p-fix makes the last test to pass
"add -p": work-around an old laziness that does not coalesce hunks
add--interactive.perl: factor out repeated --recount option
t3701: Editing a split hunk in an "add -p" session
add -p: 'q' should really quit
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/apply.c | patch | | diff1 | | diff2 | | blob | history |
| t/t3701-add-interactive.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/apply.c
Simple merge
diff --cc t/t3701-add-interactive.sh
Simple merge