mergetool--lib: refactor {diff,merge}_cmd logic