diff options
Diffstat (limited to 'Documentation/config/merge.adoc')
| -rw-r--r-- | Documentation/config/merge.adoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config/merge.adoc b/Documentation/config/merge.adoc index 857de5b40b..d2d0f21a71 100644 --- a/Documentation/config/merge.adoc +++ b/Documentation/config/merge.adoc @@ -69,7 +69,8 @@ merge.renormalize:: Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line - endings). In such a repository, Git can convert the data + endings). In such a repository, for each file where a + three-way content merge is needed, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section "Merging branches with differing checkin/checkout |