summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-12-14 16:21:30 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-14 08:45:58 -0800
commit864075ec433644e5908589fe79f8b3296f896867 (patch)
tree29d571e93b0d387c35b8ec3f926086013cd6381d /Documentation/git-merge-one-file.txt
parentmerge-ort: add modify/delete handling and delayed output processing (diff)
downloadtgif-864075ec433644e5908589fe79f8b3296f896867.tar.xz
merge-ort: add basic data structures for handling renames
This will grow later, but we only need a few fields for basic rename handling. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions