mergetools / gvimdiffon commit Merge branch 'jk/alias-in-bare' (fb3b7b1)
   1. "$MERGE_TOOLS_DIR/vimdiff"