diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-29 15:00:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-29 15:00:15 -0700 |
| commit | 659f09689614d3d745b9aea746672bf43216d294 (patch) | |
| tree | 57ce3a29e22e446ef495771f7946fa7fad3fbc87 /t/t6200-fmt-merge-msg.sh | |
| parent | 8e105e3928fccb8038a542ee7fb5986b7ec48eb9 (diff) | |
| parent | 32a90233d147bd697b338326bd1fabf9edc3f1fe (diff) | |
| download | git-659f09689614d3d745b9aea746672bf43216d294.tar.gz | |
Merge branch 'jc/maint-add-p-coalesce-fix'
* jc/maint-add-p-coalesce-fix:
t3701: ensure correctly set up repository after skipped tests
Revert "git-add--interactive: remove hunk coalescing"
Splitting a hunk that adds a line at the top fails in "add -p"
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
0 files changed, 0 insertions, 0 deletions