37118e70bc3c86e8fdafc31e4cc7026d71694ef4 - gerrit

commit: 37118e70bc3c86e8fdafc31e4cc7026d71694ef4
[log]
author: Edwin Kempin <edwin.kempin@sap.com>
Wed Oct 12 10:04:47 2011 +0200
committer: Edwin Kempin <edwin.kempin@sap.com>
Wed Oct 26 21:57:59 2011 +0200
tree: d6be8cf84e96892f71baad9bc9bd04a55d61c45e
parent: 813123b5203882487e1b7c853aa251e032065b97 [diff]

Explain 'Automatically resolve conflicts'

In the Gerrit documentation explain the project option 'Automatically
resolve conflicts'.

Change-Id: Ib43316092001d5f02ba68507c95c7bfd3ad049ce
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

Documentation/project-setup.txt[diff]

1 file changed