mergetools / gvimdiffon commit Merge branch 'jh/resize-convert-scratch-buffer' (1828e52)
   1. "$MERGE_TOOLS_DIR/vimdiff"