
The submit type and the content merge option (aka automatically resolve conflicts) are related and should be displayed next to each other. Change-Id: I72df09eda85c080b033b2c38683d006ac4d81dbe Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
The submit type and the content merge option (aka automatically resolve conflicts) are related and should be displayed next to each other. Change-Id: I72df09eda85c080b033b2c38683d006ac4d81dbe Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>