mergetools / gvimdiffon commit Merge branch 'jk/cocci' (769af0f)
   1. "$MERGE_TOOLS_DIR/vimdiff"