Add diffconflicts script which enables vim as git mergetool
zsh: set term title to dirname if title is called without any arguments, allow additional arguments to be passed to gdc function