mergetools / gvimdiffon commit Merge branch 'mk/combine-diff-context-horizon-fix' (edc7f0a)
   1. "$MERGE_TOOLS_DIR/vimdiff"