diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-06-06 14:03:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-06 14:03:36 -0700 |
| commit | 20fbf7dd421d05399dfe916edf8eed1932b15e22 (patch) | |
| tree | d5b5cb5328fef4176ccc2d09be1172ac8de89a02 /t/t4018/cpp-struct-definition | |
| parent | Git 2.22-rc3 (diff) | |
| parent | merge-recursive: restore accidentally dropped setting of path (diff) | |
| download | tgif-20fbf7dd421d05399dfe916edf8eed1932b15e22.tar.xz | |
Merge branch 'en/merge-directory-renames-fix'
Recent code restructuring of merge-recursive engine introduced a
regression dealing with rename/add conflict.
* en/merge-directory-renames-fix:
merge-recursive: restore accidentally dropped setting of path
Diffstat (limited to 't/t4018/cpp-struct-definition')
0 files changed, 0 insertions, 0 deletions