t / t5100 / msg0016on commit mergetool-lib: combine vimdiff and gvimdiff run blocks (ae69fd0)
   1and some content
   2