t / t5100 / msg0016on commit mergetool: accept -g/--[no-]gui as arguments (063f2bd)
   1and some content
   2