diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:12 -0700 |
| commit | 10b8084ee1be90227dff570fee8a57d183e7ae07 (patch) | |
| tree | 0f9ec14826b2bb775183faa7fc479b2c17a9c00e /t/t2026-worktree-prune.sh | |
| parent | Sync with maint (diff) | |
| parent | merge-recursive: do not check working copy when creating a virtual merge base (diff) | |
| download | tgif-10b8084ee1be90227dff570fee8a57d183e7ae07.tar.xz | |
Merge branch 'en/merge-fixes'
"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.
* en/merge-fixes:
merge-recursive: do not check working copy when creating a virtual merge base
merge-recursive: remove duplicate code
Diffstat (limited to 't/t2026-worktree-prune.sh')
0 files changed, 0 insertions, 0 deletions