diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:10 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:11:00 +0900 |
| commit | 9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34 (patch) | |
| tree | d88c56b3315d682a1dd3cca1badb221de5b04354 /column.h | |
| parent | merge-recursive: when comparing files, don't include trees (diff) | |
| download | tgif-9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34.tar.xz | |
merge-recursive: apply necessary modifications for directory renames
This commit hooks together all the directory rename logic by making the
necessary changes to the rename struct, it's dst_entry, and the
diff_filepair under consideration.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'column.h')
0 files changed, 0 insertions, 0 deletions