mergetools / gvimdiff2on commit Merge branch 'tg/stash-push' (44c3f09)
   1. "$MERGE_TOOLS_DIR/vimdiff"