[dflock]

Yes. If you have a conflict, you can either run `git mergetool` and it will use that meld config. `git mt` is an alias for `git mergetool`.