mergetools / gvimdiffon commit Merge branch 'sk/gitweb-highlight-encoding' (04bd6da)
   1. "$MERGE_TOOLS_DIR/vimdiff"