mergetools / gvimdiffon commit builtin/apply: avoid parameter shadowing 'linenr' global (eb8fdbf)
   1. "$MERGE_TOOLS_DIR/vimdiff"