mergetools / vimdiff3on commit rebase: apply cocci patch (b17ca8f)
   1. "$MERGE_TOOLS_DIR/vimdiff"