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 /git-mergetool--lib.sh | |
| parent | Merge branch 'tr/maint-doc-stash-pop' into maint (diff) | |
| parent | t3701: ensure correctly set up repository after skipped tests (diff) | |
| download | tgif-f2823263bd53b62831450277c746c6cbfcb95a15.tar.xz | |
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 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions