mergetools / gvimdiffon commit Merge branch 'jk/shell-portability' (45c0c21)
   1. "$MERGE_TOOLS_DIR/vimdiff"