Disable checkbox for useContentMerge if 'Fast Forward Only'
Disable the checkbox 'Automatically resolve conflicts' in the
ProjectInfoScreen if 'Fast Forward Only' is chosen as submit
type. Since the setting for the useContentMerge option is ignored if
'Fast Forward Only' is chosen as submit type it is only confusing
to the user if this option is editable but has no effect.
Change-Id: I963df4d577120e1671dd7e9faf195c600df6ff5e
Signed-off-by: Edwin Kempin <edwin.kempin@gmail.com>
Signed-off-by: Shawn O. Pearce <sop@google.com>
2 files changed
