Merge branch 'jk/mergetool-lib-refactor'

Code cleanup. * jk/mergetool-lib-refactor: mergetool--lib: refactor {diff,merge}_cmd logic