mergetools / gvimdiffon commit Merge branch 'kn/git-cd-to-empty' into maint (c974184)
   1. "$MERGE_TOOLS_DIR/vimdiff"