| commit | cf5e35bd38ba3eb6c750578506abc7b7842543bf | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Wed Jun 05 12:09:05 2019 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Wed Jun 05 12:11:31 2019 +0900 |
| tree | 905bdd89542c2d755b03dcd8ca9119794f471a87 | |
| parent | e200d0ddedab3d6d971c24cfb1565cac3c1e36cc [diff] |
Add missing 'Allow content merges' section title in project config documentation Change-Id: I49dc89fabedf17996c5f8245b3fb024df2b2e6e3
diff --git a/Documentation/config-project-config.txt b/Documentation/config-project-config.txt index 53e87ad..451e093 100644 --- a/Documentation/config-project-config.txt +++ b/Documentation/config-project-config.txt
@@ -562,6 +562,7 @@ the important distinction that Rebase Always does not ignore dependencies. [[content_merge]] +=== Allow content merges If `Allow content merges` is enabled, Gerrit will try to do a content merge when a path conflict occurs.