Improve the textual description of the content merge option
The original wording is misleading in multiple ways:
Firstly, it is unclear that "conflicts" refer to "path conflicts", not
"content conflicts". Usually Gerrit users have a strong Git background
and understand a (merge) conflict to always be a content conflict as
that is how "git merge" works.
Secondly, the conflict is not guaranteed to be resolved automatically.
If a path conflict turns out to be a content conflict where the same
lines of code are modified it still has to be resolved manually. We
should not create the impression that Gerrit tries to apply some magic
to automatically resolve line conflicts.
Change-Id: I46de5633055c06528e7aa94099952689743b6b6e
diff --git a/Documentation/project-configuration.txt b/Documentation/project-configuration.txt
index 94af04f..e8f870f 100644
--- a/Documentation/project-configuration.txt
+++ b/Documentation/project-configuration.txt
@@ -114,7 +114,7 @@
the same file has also been changed on the other side of the merge.
[[content_merge]]
-If `Automatically resolve conflicts` is enabled, Gerrit will try
+If `Allow content merges` is enabled, Gerrit will try
to do a content merge when a path conflict occurs.
[[project-state]]
