t / t5100 / msg0016on commit mergetool--lib: refactor {diff,merge}_cmd logic (d2512fc)
   1and some content
   2