t / t5100 / msg0009on commit merge-recursive: rename merge_options argument from 'o' to 'opt' (259ccb6)
   1This is to fix diff-format documentation.
   2