mergetools / gvimdiffon commit Merge branch 'nd/completion-more-parameters' (b0e7fb2)
   1. "$MERGE_TOOLS_DIR/vimdiff"