diff options
Diffstat (limited to 'Documentation/gitattributes.adoc')
| -rw-r--r-- | Documentation/gitattributes.adoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitattributes.adoc b/Documentation/gitattributes.adoc index 5d12b78549..7eaca89972 100644 --- a/Documentation/gitattributes.adoc +++ b/Documentation/gitattributes.adoc @@ -701,8 +701,8 @@ where the attribute is not in place would normally cause merge conflicts. To prevent these unnecessary merge conflicts, Git can be told to run a -virtual check-out and check-in of all three stages of a file when -resolving a three-way merge by setting the `merge.renormalize` +virtual check-out and check-in of all three stages of each file that +needs a three-way content merge, by setting the `merge.renormalize` configuration variable. This prevents changes caused by check-in conversion from causing spurious merge conflicts when a converted file is merged with an unconverted file. |