Remove explicit prompt supression from departures alias
Add upstream alias, the inverse of departures
Rework WinMerge difftool/mergetool commands to remove path