mergetools / gvimdiffon commit Merge branch 'jw/gitweb-sample-update' into maint (63d9fa2)
   1. "$MERGE_TOOLS_DIR/vimdiff"