summaryrefslogtreecommitdiff
path: root/trace2
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2019-04-05 08:00:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-08 16:02:08 +0900
commit6d169fd321c0da4b20c13d08bbe19d55cab12e11 (patch)
tree2f98c72329ce0ee2f4526cdb8f2b8ec27ffaedbb /trace2
parentt6043: fix copied test description to match its purpose (diff)
downloadtgif-6d169fd321c0da4b20c13d08bbe19d55cab12e11.tar.xz
merge-recursive: track information associated with directory renames
Directory rename detection previously silently applied. In order to allow printing information about paths that changed or printing a conflict notification (and only doing so near other potential conflict messages associated with the paths), save this information inside the rename struct for later use. A subsequent patch will make use of the additional information. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trace2')
0 files changed, 0 insertions, 0 deletions