Files
git/Documentation
Elijah Newren 002a6dfc7c 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>
2021-08-05 08:57:40 -07:00
..
2021-08-02 14:06:43 -07:00
2019-05-09 00:37:27 +09:00
2020-08-04 18:34:02 -07:00
2020-09-19 15:56:06 -07:00
2021-04-08 14:18:03 -07:00
2019-01-23 11:37:29 -08:00
2019-05-07 13:04:48 +09:00
2019-05-07 13:04:48 +09:00
2021-05-24 18:08:22 +09:00
2021-05-16 21:05:24 +09:00
2019-10-21 12:02:39 +09:00