Accept more cmd-line parameters to fixup git-mergetool.

It seems the parameters are actually handled in kdiff3/src/kdiff3.cpp but I've done almost no review or testing of that.

It's a quick fix for #1.