gerrit-config.txt: cache-automerge is for "merge" commmits

Change-Id: I952978259cf0507a200d5aa5246f1d3b1eb52bfd
This commit is contained in:
Sven Selberg
2020-05-05 16:16:41 +02:00
parent 06d9f972cc
commit 0299e25fee

View File

@@ -1200,7 +1200,7 @@ Default is false.
[[change.cacheAutomerge]]change.cacheAutomerge::
+
When reviewing diff commits, the left-hand side shows the output of the
When reviewing merge commits, the left-hand side shows the output of the
result of JGit's automatic merge algorithm. This option controls whether
this output is cached in the change repository, or if only the diff is
cached in the persistent `diff` cache.