mergetools / gvimdiffon commit Merge branch 'jk/peel-ref' into maint (5ccb7e2)
   1. "$MERGE_TOOLS_DIR/vimdiff"