summaryrefslogtreecommitdiff
path: root/compat/mingw.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-08-04 23:50:49 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-05 08:57:40 -0700
commit002a6dfc7c4642524d1e82f8cf994fc9ea5786f9 (patch)
tree9b244d002f6d5e536ec673a0d20d09d248fa4fd2 /compat/mingw.h
parentmerge-strategies.txt: update wording for the resolve strategy (diff)
downloadtgif-002a6dfc7c4642524d1e82f8cf994fc9ea5786f9.tar.xz
merge-strategies.txt: do not imply using copy detection is desired
Stating that the recursive strategy "currently cannot make use of detected copies" implies that this is a technical shortcoming of the current algorithm. I disagree with that. I don't see how copies could possibly be used in a sane fashion in a merge algorithm -- would we propagate changes in one file on one side of history to each copy of that file when merging? That makes no sense to me. I cannot think of anything else that would make sense either. Change the wording to simply state that we ignore any copies. Acked-by: Derrick Stolee <dstolee@microsoft.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/mingw.h')
0 files changed, 0 insertions, 0 deletions