From: Junio C Hamano Date: Thu, 7 Jan 2021 23:29:49 +0000 (-0800) Subject: Merge branch 'en/merge-ort-3' into en/ort-directory-rename X-Git-Tag: v2.31.0-rc0~56^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f894b22636d5d0cdfca0ae5fd88d327cc3349b3;p=thirdparty%2Fgit.git Merge branch 'en/merge-ort-3' into en/ort-directory-rename * en/merge-ort-3: merge-ort: add implementation of type-changed rename handling merge-ort: add implementation of normal rename handling merge-ort: add implementation of rename collisions merge-ort: add implementation of rename/delete conflicts merge-ort: add implementation of both sides renaming differently merge-ort: add implementation of both sides renaming identically merge-ort: add basic outline for process_renames() merge-ort: implement compare_pairs() and collect_renames() merge-ort: implement detect_regular_renames() merge-ort: add initial outline for basic rename detection merge-ort: add basic data structures for handling renames --- 8f894b22636d5d0cdfca0ae5fd88d327cc3349b3