mergetools / gvimdiff2on commit Add new @ shortcut for HEAD (cdfd948)
   1. "$MERGE_TOOLS_DIR/vimdiff"