update: allow setting default update check to "noconflict" The new value allows update (linear or not) as long as they don't result in file merges. I'm hoping that this value can some day become the default.

#require docutils gettext

  $ $TESTDIR/check-gendoc ru
  checking for parse errors