mergetools / gvimdiffon commit Merge branch 'rs/t4062-obsd' into next (02bff42)
   1. "$MERGE_TOOLS_DIR/vimdiff"