fix word-diff command line argument
fixed mergetool gui slide and order of where gui falls