diff options
| author | Elijah Newren <newren@gmail.com> | 2021-08-05 01:50:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-05 17:57:39 +0200 |
| commit | 510415ecc9d6ff4a99991dc1b70a1ac50818a539 (patch) | |
| tree | 4deb454f75ead4f0b079b5dc45e5094949ca6e45 /archive.c | |
| parent | Documentation: edit awkward references to `git merge-recursive` (diff) | |
| download | git-510415ecc9d6ff4a99991dc1b70a1ac50818a539.tar.xz git-510415ecc9d6ff4a99991dc1b70a1ac50818a539.zip | |
merge-strategies.txt: update wording for the resolve strategy
It is probably helpful to cover the default merge strategy first, so
move the text for the resolve strategy to later in the document.
Further, the wording for "resolve" claimed that it was "considered
generally safe and fast", which might imply in some readers minds that
the same is not true of other strategies. Rather than adding this text
to all the strategies, just remove it from this one.
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 'archive.c')
0 files changed, 0 insertions, 0 deletions