diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:36:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:36:46 -0700 |
| commit | c69e8b693591bc35e8f9421eacb9d59c71807304 (patch) | |
| tree | fef8fdcbd924820c5b25e2671be2d92219de23aa /t/t6024-recursive-merge.sh | |
| parent | 43d532e6ba3450a84cad007062b8ac429d7a8ac3 (diff) | |
| parent | 0bf9fc0cd28bf8e983a5280676fcaeb826403516 (diff) | |
| download | git-c69e8b693591bc35e8f9421eacb9d59c71807304.tar.gz git-c69e8b693591bc35e8f9421eacb9d59c71807304.tar.xz | |
Merge branch 'jc/maint-add-p-overlapping-hunks' into maint
* 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
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions