merge: update documentation for {merge,diff}.renameLimit
commita7152e9d226652e6ceaa64f099fc628aa2a909bd
authorBen Peart <Ben.Peart@microsoft.com>
Wed, 2 May 2018 16:01:13 +0000 (2 16:01 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:19:41 +0000 (8 16:19 +0900)
tree69dcb177e115ae89d2f47c8c15ea0a4dfde27f68
parent1de70dbd1ada0069d1b6cd6345323906cc9a9ed3
merge: update documentation for {merge,diff}.renameLimit

Update the documentation to better indicate that the renameLimit setting is
ignored if rename detection is turned off via command line options or config
settings.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-config.txt
Documentation/merge-config.txt