diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:15 -0800 |
| commit | 6a65bdcc8c610b31fff6a171e6f49045c3980027 (patch) | |
| tree | 32a80856e49b46fdca34f0d904a2b33f5183bb8c /git-merge-resolve.sh | |
| parent | Merge branch 'ew/svn-1.9.0-auth' into maint (diff) | |
| parent | contrib/subtree: fix "subtree split" skipped-merge bug (diff) | |
| download | tgif-6a65bdcc8c610b31fff6a171e6f49045c3980027.tar.xz | |
Merge branch 'dw/subtree-split-do-not-drop-merge' into maint
The "split" subcommand of "git subtree" (in contrib/) incorrectly
skipped merges when it shouldn't, which was corrected.
* dw/subtree-split-do-not-drop-merge:
contrib/subtree: fix "subtree split" skipped-merge bug
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions