mergetools / gvimdiff2on commit diff-parseopt: convert --inter-hunk-context (16ed6c9)
   1. "$MERGE_TOOLS_DIR/vimdiff"