diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:46:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:46:52 -0700 |
| commit | f2823263bd53b62831450277c746c6cbfcb95a15 (patch) | |
| tree | 394b44bd80218db1af71eba168b30ce3ece71850 /builtin-fmt-merge-msg.c | |
| parent | db8af4b5ea7b58b2aef0f0c85f7b570719deb0ae (diff) | |
| parent | 32a90233d147bd697b338326bd1fabf9edc3f1fe (diff) | |
| download | git-f2823263bd53b62831450277c746c6cbfcb95a15.tar.gz | |
Merge branch 'jc/maint-add-p-coalesce-fix' into maint
* 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 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions